Add support for uploading picture into profile
Merge branch 'master' of https://github.com/MozaicWorks/KeepInTouch

Conflicts:
	grails-app/conf/DataSource.groovy