creating CI-conflicted situations is really annoying, not doing that would be great

Basic git doc for employees

* replaced sphinx :guilabel: directive by a simple strong
* moved rendered notes to non-rendered comments, not that I expect anybody to
  care or help /emo
* remove an explicit code-block directive by a simple ::

[ADD] easy-setup script for employees

and others, but mostly employees

Conflicts:
	addons/mass_mailing/controllers/main.py

bzr revid: csn@openerp.com-20140512114532-726a1z0wqbpz96t8

bzr revid: fme@openerp.com-20140512113820-oidhod8ovqp3nh9a

This method was (partially) removed at rev.9421 
rev-id al@openerp.com-20140507153223-q73u5lhyrfw98o3a

bzr revid: odo@openerp.com-20140512103935-o0ue9wzenm5wjejq

* added a ``tracking_disable`` context key used by mail to completely disable
  subscriptions setup and events generation during create and write operations
* added import option to optionally set up that context key and speed up
  imports at the cost of not setting up subscriptions and not sending
  create/update events

bzr revid: xmo@openerp.com-20140512100400-d1axjam2d0i2y0tf

bzr revid: mat@openerp.com-20140512092718-s6143ajy2g18ofy4

* fill-paragraph
* remove sections referring to removed methods with no obvious replacement

bzr revid: xmo@openerp.com-20140512085546-50u4beuvakgfett8

Forward-port of latest saas-4, up to revision 3994 (rev-id jke@openerp.com-20140509131203-4gy3nhlj0v6fk7zv)

Forward-port of latest saas-4, up to revision 5211 (revid fme@openerp.com-20140509164408-rtml4brrhpiv4zz9)

Forward-port of latest saas-4, up to revision 9416 (rev-id fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w)

bzr revid: mat@openerp.com-20140512072331-0lidgqb6x7fregdj

bzr revid: fp@tinyerp.com-20140511154058-kj8nn9fdl3li9nzi

[FIX] better handling of '/'. / is the first menu and not the first menu is /. Allows to move the first menu in another position

bzr revid: fp@tinyerp.com-20140511153235-6mmygt69z45rcx4r

bzr revid: fp@tinyerp.com-20140511143314-nzn1239l00arbxjq

bzr revid: fp@tinyerp.com-20140511134037-84vnn1b4zfzk8som

bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4

bzr revid: fp@tinyerp.com-20140511074755-5b3iy2b1xk7cjxmf

bzr revid: fp@tinyerp.com-20140509202753-p5080kwk8dupfdrc

bzr revid: fme@openerp.com-20140509164408-rtml4brrhpiv4zz9

bzr revid: fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w

bzr revid: fme@openerp.com-20140509151855-7v4hp08qvmac1u2d

bzr revid: fme@openerp.com-20140509144608-btah4s8zorzon2jo

bzr revid: fme@openerp.com-20140509141106-vbokuh0prptxavvg

bzr revid: fme@openerp.com-20140509141024-xa9mawoye3o8e6c1

[MERGE] [ADD] mass_mailing: add a snippet to allow subscribing to a contact list (newsletter). Also cleaned the wording of the snippet allowing to subscribe do a discussion group to avoid confusion.

bzr revid: tde@openerp.com-20140509135051-tt1blzojwtpt86lr