some change by server
Merge branch 'master' of https://github.com/hnlapplications/gotprojects_prototype

Conflicts:
	index.php