manifest
Merge branch 'master' of https://github.com/alexliubj/takemynotes

Conflicts:
	Src/Client/bin/AndroidManifest.xml