Updates
Updates
Merge origin/master

Conflicts:
	assets/css/custom/nav.less
	assets/css/style.css
	assets/js/min/app-min.js
	config.codekit