angular factories & data.json
conflicts resolve
Merge branch 'master' of https://github.com/FridayMarch26th/hs2urbanplanning

Conflicts:
	app/index.html
	app/scripts/hs2urbanplanning.js
	app/scripts/main/config.js
	app/scripts/main/main-ctrl.js
angular inclusions