Android client
Merge branch 'master' of https://github.com/darkjoker/arduindow

Conflicts:
	server/index.php