adding annotations to contents
Merge branch 'data-model'
updatign to rails 4.0.0