tryin to get stuff functional
Merge branch 'master' of https://github.com/adminion/adminion