orange-red icons for real
Merge branch 'master' into July21

Conflicts:
	res/layout/activity_create_event.xml
Merge pull request #92 from RaphaelTurtlePower/July21

orange-red icons for real
Merge branch 'master' into bug_fixes