edit album
Merge branch 'master' of https://github.com/thomaswinckell/spicstome.git

Conflicts:
	src/com/spicstome/client/services/SpicsToMeServices.java
	src/com/spicstome/client/services/SpicsToMeServicesAsync.java
	src/com/spicstome/server/services/SpicsToMeServicesImpl.java