bootstrap and google maps conflict fixed
Merge branch 'master' of https://github.com/weshack/couch