Remove gem 'magic_encoding'

Useless with ruby 2.1.2 :)
Add gem 'annotate'

Make models more readable
Annotate models
Minor improvement
Merge branch 'develop'