icons for event types, and better EventDetail layout
Merge pull request #90 from RaphaelTurtlePower/July21

icons for event types, and better EventDetail layout
more UI changes
temporary checkin to resolve merge conflict
UI tidyup, created funnel icon, styled create buttons
Merge pull request #91 from RaphaelTurtlePower/July21

UI tidyup, created funnel icon, styled create buttons
Merge branch 'master' into bug_fixes

Conflicts:
	res/layout/activity_settings.xml
	src/com/app/letsgo/activities/SettingsActivity.java