Initial commit
Merge https://github.com/stacksync/android

Conflicts:
	.gitignore