Added an FPS counter to GameState, also passed time since last update to all update() methods
Merge remote-tracking branch 'origin/master'