tempaltizing rails admin views
fixed merge conflict
nested lists for users in rails admin
Merge branch 'master' of github.com:nupmmarkbegale/rogalski into deployify