we'll see what comes of this...
Merge branch 'master' of https://github.com/adminion/adminion into central-arch
work from california on laptop
Merge branch 'central-arch' of https://github.com/adminion/adminion into central-arch
Merge branch 'master' of https://github.com/adminion/adminion into central-arch

Conflicts:
	public/scripts/adminion.js
switching to macbook...