Update Profile page UI
Updates to interest tags to make them more understandable
Add Activity Page survey questions
Merge branch 'master' into joyride-additions

Conflicts:
	activity.php
	profile.php