workspace.xml
Merge branch 'master' of https://github.com/theodori/AndroidExperimentation

Conflicts:
	src/WebService/.idea/workspace.xml
Merge branch 'master' of https://github.com/theodori/AndroidExperimentation
Merge branch 'master' of https://github.com/theodori/AndroidExperimentation