Validation (User settings, messages)
fictitious commit
Merge branch 'master' of github.com:bionic-university/sparrow
Added aboutMe page
Merge branch 'master' into feature/aboutMe

Conflicts:
	src/BionicUniversity/Bundle/MessageBundle/Entity/Message.php
	src/BionicUniversity/Bundle/UserBundle/Entity/Interest.php
	src/BionicUniversity/Bundle/UserBundle/Entity/User.php
	src/BionicUniversity/Bundle/UserBundle/Resources/config/doctrine/Interest.orm.yml
Merge branch 'feature/aboutMe'