Fix Design
Merge branch 'Design' into alpha

Conflicts:
	AndroidManifest.xml
	res/layout/activity_event_add.xml
fix design
improve design