Moved FlagEvent to correct location
Merge remote-tracking branch 'origin/more-retrofit' into more-retrofit