CHANGELOG for latest changes :)
Merge branch 'master' into master.go

Conflicts:
	app/src/main/res/values/strings.xml