local change
Merge branch 'master' of https://github.com/codeocelot/config_manager

Conflicts:
	appcfgs.js
	public/app/controllers.js
	views/config_station.jade
	views/includes/findAll.jade