final
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/myapplication/app/Data.java