markup moved  to server and added map
deleted hbs import
Merge remote-tracking branch 'origin/master'