admin works good, needs layout though
Merge branch 'master' into fc-admin
admin stuff, needs frumos layout