Clean files
Merge branch 'master' of https://github.com/aldrin15/salespace_ecommerce

Conflicts:
	application/modules/site/views/tpl_landing.php