Merge branch 'hotfix/www_prefix' into develop
Merge branch 'hotfix/www_prefix'
Merge branch 'master' of https://github.com/jbroadway/saasy into develop
Fix endless login redirect loop and authorize
Added missing install step of configuring user handlers
Added sqlite schema to scaffold generator
Fix endless login redirect loop and authorize
Type hinting
Looked like a typo
Remove alias from navigation
Adjust default template to allow no entries
Merge branch 'master' of https://github.com/jbroadway/saasy into feature/model_update
Merge branch 'feature/model_update' into develop
Merge branch 'master' of https://github.com/jbroadway/saasy into develop

Conflicts:
	lib/App.php
Merge branch 'master' of https://github.com/jbroadway/saasy into develop

Conflicts:
	lib/App.php
	views/app/view.html
Updates from sassy min
Reverse edit to index
Revert change
fix getting extension from photo
Merge branch 'hotfix/photo_error'