pay-master
Merge branch 'master' into pay-master

Conflicts:
	app/migration.sql
	src/ITDoors/PayMasterBundle/Entity/PayMaster.php~
organization salf
pay-master
Merge branch 'pay-master'
pay-master