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

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

Conflicts:
	css/style.css
	media.php