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

Conflicts:
	app/Model/Activity.php
Merge branch 'master' of https://github.com/budsus/lpps