Merge branch 'master' of github.com:tomarcafe/tzm-blade into angelo

Conflicts:
	app/controllers/map.coffee
	assets/js/map.js
now reporting innerwidth and innerheight at /map
work on map
Merge branch 'master' of github.com:tomarcafe/tzm-blade into angelo

Conflicts:
	app/controllers/map.coffee
	assets/js/map.js
now returning chartsvg.html() as a response for report innerwidth and innerheight at /map
Merge branch 'master' of github.com:tomarcafe/tzm-blade into angelo
hooked w/h/ send to resize event
Merge branch 'master' of github.com:tomarcafe/tzm-blade into angelo
fixed multiple adds to chartSvg
Merge branch 'angelo'

Conflicts:
	views/map.blade
Merge branch 'master' of github.com:tomarcafe/tzm-blade

Conflicts:
	app/controllers/map.coffee