Merge branch 'develop'

Conflicts:
	public/js/controllers.js
	routes/api.js
	views/index.jade
	views/layout.jade

Now merged Ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/controllers.js
	routes/api.js
	views/index.jade
	views/layout.jade