web interface
Merge branch 'master' of https://github.com/theodori/AndroidExperimentation

Conflicts:
	.gitignore
	src/WebService/.idea/workspace.xml
Enhancements to the website