updated all the views
Merge branch 'master' of https://github.com/sarahwada/citris_mobile_app into sarah
added EventsPriorityQueue, untested