- removed TODO :)))
Merge branch 'master' of https://github.com/phoenix-frozen/uh-oh-android

Conflicts:
	app/src/main/java/emergencycall/intertech/com/emergencycall/ui/MainActivity.java
Merge branch 'master' of https://github.com/phoenix-frozen/uh-oh-android