commit
Merge branch 'master' of https://github.com/budsus/lpps

Conflicts:
	.idea/workspace.xml
	app/Controller/ParticipantsController.php
Merge branch 'master' of https://github.com/budsus/lpps

Conflicts:
	.idea/workspace.xml
	app/View/Activities/edit.ctp
	app/View/Participants/add.ctp