Merge branch 'master' into dev
Merge branch 'master' into dev-menu
Added a second button for a big map
Added a helper div to the image menu buttons
Added CSS to vertically align image menu buttons and space them apart horizontally
Added some FIXMEs
Ignored .todo an IDE Extension config file
Merge branch 'dev-menu' into dev
Merge branch 'dev' into gh-pages