Merge branch 'mko186' into develop

Conflicts:
	htdocs/langs/en_US/orders.lang
	htdocs/langs/fr_FR/orders.lang
Merge pull request #437 from atm-maxime/develop

Branch mko186 merged
New: add possibility to defined position/job of a user

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
Fix: optimize code
Trad: Add ca_ES and es_ES translations
Qual: Removed dead code
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Init script can run on rom command line
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
New: More import options. Prepare database
Add changelog entries
More elegant position of button to aufofill fields.
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Merge pull request #439 from atm-maxime/develop

Add changelog entries
Merge pull request #438 from simnandez/develop

Trad: Add ca_ES and es_ES translations
New: [ task #210 ] Can choose cash account during POS login
Fix: Usage of specific mysql function is forbidden
Fix: Bad message
Fix: Revert bugged new feature that show false information.
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	ChangeLog