form submission done
Merge branch 'email_activation' of https://github.com/NikhilSama/Giftology into email_activation

Conflicts:
	app/View/Reminders/view_friends.ctp