Problem with workspace again.
Merge branch 'master' of https://github.com/SafeWalk/SafeWalk

Conflicts:
	.idea/workspace.xml
Fixed 'other' selection bugs and changed input for phone setting from 'number' to 'phone'