.idea file.
Changed the login App to the unrestricted App.
Merge branch 'feature/leo/exampleApp' into develop
Merge branch 'feature/leo/simplifiedApp' into develop
workspace
Merge branch 'feature/robb/review' into develop

Conflicts:
	.idea/workspace.xml
workspace