update fixed Presenter and GenericActivity
Merge remote-tracking branch 'origin/master'