dase
dase2
Merge branch 'master' of ssh://git@github.com/jonaslergell/android.git

Conflicts:
	.gitignore