-Fixed EventTypeResult
-Added loading from json time range
Merge branch 'develop'