Fixed bug in router,config. Unexpected end
Removed map.js from merge, and commented controllers