attempting to fix compose time
Merge branch 'master' of https://github.com/scobb/Impromptu

Conflicts:
	app/src/main/java/com/example/steve/impromptu/Entity/Event.java

more attempts to fix compose time
Merge branch 'master' of https://github.com/scobb/Impromptu