Site Contents - update 2
Merge branch 'master' of https://github.com/aldrin15/supercms

Conflicts:
	application/views/salespace2K14/sections/main_nav.php
Merge branch 'master' of https://github.com/aldrin15/supercms