commit
Merge branch 'master' of https://github.com/selaoll/oris-site

Conflicts:
	src/main/resources/META-INF/spring/email.properties