Changes in menu
Merge branch 'develop' of https://github.com/ajency/Browntape into Profile
no message
Merge branch 'develop' of https://github.com/ajency/Browntape into Profile

Conflicts:
	browntape/www/views/profile.html