more UI changes
temporary checkin to resolve merge conflict
Merge pull request #91 from RaphaelTurtlePower/July21

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

Conflicts:
	res/layout/activity_create_event.xml