Merge branch 'master' of github.com:SergeStepuro/orient_me

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