Merge branch 'homepage' into develop
popup.js -> Clean up of redundant functions and comments. Removal of Esc-to-close popup option. Removal of 0.5 second delay for popup to appear.
Added google maps popup (still some strange behaviour)
Fixed Google maps problem, and added a marker on Daniels location.