Changes in profile
Merge branch 'master' of https://github.com/mmilkov/YourSocialChef

Conflicts:
	public/modules/core/views/newHeader.html