show location
backstack fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Snackator/app/app.iml