Merge branch 'master' of https://github.com/SafeWalk/SafeWalk

Conflicts:
	.idea/workspace.xml