Merge branch 'develop' of github.com:usersource/anno into feature/mvp-landscape

Conflicts:
	anno_app/www/anno/scripts/dojo/dojo.js
Merge branch 'feature/mvp-landscape' of github.com:usersource/anno into feature/mvp-landscape
Merge branch 'feature/mvp-landscape' of github.com:usersource/anno into feature/mvp-landscape
Merge branch 'feature/mvp-landscape' of github.com:usersource/anno into feature/mvp-landscape
[iOS] Changing screen orientation to 'landscape' when image is landscape