Revert dd368bb..5b0c857

This rolls back to commit dd368bbfc882097e1688f3840a71cfbe28865aef.
Merge branch 'master' of https://github.com/zacmontague/DMApp

Conflicts:
	Android Code/dancemarathon/AndroidManifest.xml
Revert "Added DM colors and trimmed event field strings"

This reverts commit a7a890b44482c319804fcac2727409d6c7e426b2.
Revert "Revert "Added DM colors and trimmed event field strings""

This reverts commit dd50ce83511cbc093c645f737c5af12263d53ab9.
wjrqke
Revert "Merge branch 'master' of https://github.com/zacmontague/DMApp"

This reverts commit e0f82257d6e12082fcc5589768dcce14598439a8, reversing
changes made to 1925ede48b79aa22da4f3a4f464bf5638289b85b.
Revert "Revert dd368bb..5b0c857"

This reverts commit 1925ede48b79aa22da4f3a4f464bf5638289b85b.