Merge remote-tracking branch 'tzm/master'

Conflicts:
	assets/css/main.css
	assets/js/map.js
Merge branch 'master' of https://github.com/TZM/tzm-blade

Conflicts:
	assets/css/main.css
	assets/js/map.js
fix angelo's commits