Merge branch 'master' into develop
added attr_accessible for all belongs_to
associations
bump version 2.0.1
Merge branch 'release/2.0.1'