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

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