second
Merge branch 'master' of https://github.com/GitHubSMXY/MagicPiece.git

Conflicts:
	android/AndroidManifest.xml
	android/build.gradle
	build.gradle