configPage.html prototype
committing
Merge branch 'master' of https://github.com/adminion/adminion

Conflicts:
	public/scripts/adminion.js

committee