Merge pull request #1 from sabughnaim/master

Master
Merge pull request #2 from sabughnaim/master

php
Merge pull request #3 from sabughnaim/master

sms notification
Merge pull request #4 from sabughnaim/master

Master
Merge pull request #5 from sabughnaim/master

heroku server
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
Delete send-message.php
Delete class.googlevoice.php
recovery
This is for merging
for merge conflicts