Merge branch 'hotfix/www_prefix'
fix getting extension from photo
Merge branch 'hotfix/photo_error'
Merge branch 'hotfix/photo_error' into develop
Add IDE hints
Merge branch 'hotfix/IDE_hints' into develop

Conflicts:
	lib/App.php