Errors with code and properties
Merge branch 'develop' into feature/admin_2.0

Conflicts:
	kornell-api/src/main/resources/db/migration/2014/12/V2014.12.03.23.52__add_institution_to_s3.sql