APD-480: Back button works not for state map
Merge branch 'APD-480-BOZ' into develop

Conflicts:
	web-app/js/index.js