Py Send
Py
Merge branch 'gh-pages' of https://github.com/sabughnaim/AquaMPD into gh-pages

Conflicts:
	build/web/WEB-INF/classes/functions.js
	build/web/WEB-INF/classes/index.html
	build/web/functions.js
	build/web/index.html
	nbproject/private/private.xml
	web/functions.js