This files here in the wrong place.
Merge branch 'development' of
https://github.com/HackerSchool-IST/Passport.git into development

Conflicts:
	fenix-framework.properties
	project.properties