implemented forgot password flow
Merge branch 'master' of https://github.com/rreimi/jynx

Conflicts:
	app/views/layout_home_no_sidebar.blade.php
Merge branch 'master' of https://github.com/rreimi/jynx

Conflicts:
	app/controllers/BaseController.php
	app/controllers/RegisterController.php
	app/views/include/header.blade.php
added reset password
Merge branch 'master' of https://github.com/rreimi/jynx

Conflicts:
	app/database/sql/alter_table_20130914.sql