work
Merge branch 'work'
Merge branch 'master' of https://github.com/16twenty/16twenty

Conflicts:
	application/config/routes.php
	application/controllers/main.php
	application/views/partials/header.php
	assets/css/jquery.percentageloader-0.1.css