Changed first half of App UI
Merge branch 'master' into uiUpdate
Took out duplicate viewWillAppear method
Merge pull request #13 from Event-Sync/uiUpdate

Ui update