stashing changes
Merge branch 'master' into db_templates
fixes for admin, cleaned up routes, working on templates in db
break out the home page, allow salsa_partial to use folders, move analytics and home footer into instances folder
Merge branch 'master' into db_templates