Merge commit '860a8855df9562896002292ee69e231a7d1beab6' into develop

Latest changes from 1.4 branch

Ignored:
	doc/CHANGES
Merge commit 'd1fffa6562e831024aefb4b09655a782bad6cb51' into develop

Added legend to employee view

Conflicts:
	languages/en.lng
Merge commit '221ed129a3153f614540cf5c68746fa556b4ff1a' into develop

Used correct flag for messagequeue
Merge commit '60efa2e029b86e4376800403e25c3cdf5730bbaf' into develop

Added weeknumbers to hours day view
Merge commit '5efd424dc3e660ac7c9c3189bc6bfc12bfd8efde' into develop

Fixed delete error
Merge commit '5446175864f9c8fffcfb45af78311a5c7d177186' into develop

Install contract templates

Conflicts:
	modules/employee/install/install.inc
Merge commit '47a9ca1988eb4118ca21153aede0f5164866dc8a' into develop

Added employee user contract templates

Ignored:
	doc/CHANGES

Conflicts:
	languages/en.lng
	modules/employee/install/install.inc
Merge commit '64545900caca0ac89f1d333819265eeb732bbec7' into develop

Fixed ticket #17273 - column 'current planning' is inline editable now
Merge commit '462b7f74950130011fd2b1d839d08c888857a12b' into develop

* Allow all GET and POST parameters in links to index.php. [Guido]

Ignored:
	doc/CHANGES
Merge commit '8c04aad11ba377d73a2769453994729dd68ce55f' into develop

+ Added New and Edit links to the contract field in projects. [Guido]

Ignored:
	doc/CHANGES
Merge commit 'b7cce1bdcae55682dc156e7916afb6e7e337909e' into develop

* Fixed typo's in some translations. [Guido]

Ignored:
	doc/CHANGES
	languages/bp.lng
	languages/fr.lng
	languages/no.lng
	languages/ru.lng
	languages/sk.lng
Merge commit '3f427e09cb43a2e3072649f241663462c43b48fe' into develop

"Add flag parameter to contact constructor"

Conflicts:
	modules/organization/class.contact.inc
Merge commit '85b9ce47aed6438bbf1b0572cced6d839dbb312e' into develop

Fixed weekview date display

Ignored:
	doc/CHANGES
Merge commit 'b14e2dff6a27456bd7fc4d882510cf17f017ae7b' into develop

It's now possible to turn off one or more of the following modules:

- Notes
- Scheduler
- Todo
- Reports
- Quotation
- Docmanager
- CRM

Todo: convert install.php into install.sql files

Ignored:
	modules/config.modules.inc
	modules/reports/module.inc

Conflicts:
	modules/organization/class.contact.inc
Fix bugs introduced by commit 'b14e2dff6a27456bd7fc4d882510cf17f017ae7b'

- Module 'crm' has no node 'sales'; menu item is already defined within the 'quotation' module
- Add prepared 'documenttypes' relation to node 'tpl_project' of module 'project' and cleanup code
Merge commit '7e05242b4e8c4c9ef24004ba394535f03375b39a' into develop

Fixed bug #1561
Merge file 'languages/fr.lng' of branch svn-master into develop
Update CHANGES due merge of branch "svn-master"
Update CHANGES to reflect some more changes made

... due merge of branch "svn-master"
Merge pull request #11 from PhrozenByte/ibuildings-trunk-cherry-picking

Merge changes of branch 'svn-master'