Adding new routes and content index.
Merge remote-tracking branch 'origin/master' into twitter

Conflicts:
	app/views/layout.html