more work on my backbone content views and templates
Merge branch 'master' of github.com:42entertainment/framework-app

Conflicts:
	app/assets/javascripts/parse_app.js
adding a bunch of views to support navigation between different views
Merge branch 'master' of github.com:42entertainment/framework-app