Merge branch 'master' of https://github.com/karizza-crespo/VERSION_C4L_GROUP2.git

Conflicts:
	TABLENAMES.txt
	editinfobyadmin.php
	functions.php
	js/script.js
Merge branch 'master' of https://github.com/karizza-crespo/VERSION_C4L_GROUP2.git