update gems
update public_activity for rails 4
Merge branch 'develop'