Develop

merged with Aaron's branch and added getTransitionEvents(fromTimestamp, toTimestamp)