Merge branch 'master' of https://github.com/syncloud/android

Conflicts:
	apps/src/main/java/org/syncloud/apps/sam/Sam.java