Commited by vishwas
Merge branch 'master' of https://github.com/pezzo-in/findmyjodi

Conflicts:
	include/my_account.inc.php