Local changes
Fixing 4 user association and total counting
Fixed compatibility bug with Rails 4.1