stuff
stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/se/hellsoft/syncloud/MainActivity.java