Session settings changes
View updates
Content controller changes
Procfile changes
Templates
Templates added
Routes update for :slug
Merge branch 'master' of https://github.com/T-PWK/sails-sandbox

Conflicts:
	api/controllers/ContentController.js
	config/routes.js
	package.json
	views/layout.ejs