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

Conflicts:
	.idea/workspace.xml
	app/Controller/ActivitiesController.php
	app/Controller/ParticipantsController.php
	app/View/books/index.ctp
	app/View/bulletins/index.ctp
	app/View/materials/index.ctp