3pm tuanpa
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/web/app/services/CategoryService.php
	Dev/web/app/services/EntryService.php