Updated with new constructor in generic activity, as well as workin IO for model
Merge remote-tracking branch 'origin/master'