synchronized
Merge branch 'master' of https://github.com/JavaEEBoy/GuitarWebApp

Conflicts:
	GuitarWebApp/WebContent/pages/js/function.js
synchronized