getting the lastest yo
Merge branch 'SamsMiracle2' of https://github.com/sschwebach/Stone-Android into SamsMiracle2

Conflicts:
	src/com/unicornpower/stone/MainActivity.java
Map now correctly displays marker icons for other messages. Groundwork laid for displaying these messages
Merge branch 'SamsMiracle2'

Conflicts:
	project.properties
Merge branch 'master' into YoloSwag

Conflicts:
	src/com/unicornpower/stone/MainActivity.java
Login and Create Account Functionality is now included