Adding ability to add locations. #3
Merge branch 'locations' of github.com:NUBIC/halon into locations

Conflicts:
	public/js/app.js
Instruction on how to setup on IIS.