General file changes
Merge branch 'master' of https://github.com/dockerstack/dockerstack-dashboard

Conflicts:
	api/controllers/DeployController.js
	views/layout.ejs