changes 28-06-2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Controller/CustomersController.php
Merge branch 'master' of https://github.com/BSSAM/bs

Conflicts:
	app/Controller/CustomersController.php