worked on the map interaction.js
Merge branch 'master' of https://github.com/jfjclarke/LavaMusic.git

Conflicts:
	lavamusix/src/main/webapp/WEB-INF/views/welcome.jsp