added stopper
Merge remote-tracking branch 'origin/master'

Conflicts:
	OrientMe/src/hackby/orientme/view/MapScreen.as