Merge branch 'master' of https://github.com/yokesh28/mmrf-beta.git

Conflicts:
	projdetail.php
dghfhMerge branch 'master' of https://github.com/yokesh28/mmrf-beta.git