user
mahesh commit
Merge remote-tracking branch 'origin/master' into MaheshEtreddy

Conflicts:
	db.php
	header.php
	index.php
	new_user.php