angular + uikit updated
Merge branch 'master' of github.com:aheinze/cockpit

Conflicts:
	assets/css/cockpit.css
	assets/vendor/uikit/js/components/autocomplete.min.js
	assets/vendor/uikit/js/components/search.min.js
	assets/vendor/uikit/js/uikit.min.js