dd
Merge branch 'master' of github.com:Alife/Android
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of github.com:Alife/Android