commit 27-06-2014
Merge branch 'master' of https://github.com/BSSAM/bs

Conflicts:
	app/Controller/CustomersController.php
	app/Controller/SalesordersController.php
c