some code
aaa commit
Merge branch 'market-view' into map-refactor

Conflicts:
	app/scripts/models/map.js
have to concat template.js to main js, JST not defined.. todo: gruntfile