Add gender into user
Merge branch 'master' into feature/genderselect

Conflicts:
	src/BionicUniversity/Bundle/UserBundle/Form/UserType.php
User type fix
Merge branch 'feature/genderselect'