edit profile
Merge branch 'develop' of https://github.com/Pakblood/pakblood into develop

Conflicts:
	src/Aala/BloodBundle/Resources/config/routing.yml
Generate email and Active the user is working