commit
commit
Merge branch 'master' of https://github.com/wowche/mine

Conflicts:
	application/controllers/site.php
	application/views/footer.php
	application/views/head.php
	application/views/site/index.php
	js/less/navbar.less