Added combo view
Fixed time subtraction
Merge branch 'master' of github.com:RothschildGames/change