Pushing mass changes
Merge branch 'master' of https://github.com/Codeopolis/Ass1st

Conflicts:
	application/views/templates/header.php
	script/main.js
	style/bootstrap/css/main.css
	style/bootstrap/css/main.less