various modifications made whilst writing Android client
Merge branch 'master' of https://github.com/sbhachu/JEE