Merge branch 'master' into active_admin
install active_admin
active_admin setup
home page controller
start setting up admin interface
Merge branch 'active_admin'