With the package DATA
Merge remote-tracking branch 'origin/final' into final

Conflicts:
	build/dex/debug/classes.dex
With the package DATA
Merge remote-tracking branch 'origin/final' into final

Conflicts:
	build/dex/debug/classes.dex
With the package DATA