update testing with angularjs
update to use angualrjs
Merge branch 'angular'

Conflicts:
	public/app/css/app.css
	public/app/js/map.js
	public/index.html