Back button fix and tweaks
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/scripts/currency-watch.sh
Pom tweaks