test apk
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	out/production/AxDirectory/AxDirectory.apk
	out/production/AxDirectory/AxDirectory.unaligned.apk