blah
Merge branch 'master' of github.com:adminion/adminion

Conflicts:
	views/layout.jade
blah