213
Merge branch 'master' of https://github.com/AndreyBulgakov/DragonQ

Conflicts:
	DragonQ/app/src/main/AndroidManifest.xml