data pull
Merge branch 'master' of https://github.com/aldrin15/supercms
Merge branch 'master' of https://github.com/aldrin15/supercms

Conflicts:
	application/controllers/contact.php