some new stuff
Merge branch 'master' of github.com:naptha/ocracy