Updated templating for new files.
Merge branch 'master' into JD

Conflicts:
	application/views/templates/main_footer.php
	application/views/templates/main_sidebar.php

Signed-off-by: Moontasir <acenovember@gmail.com>