Merge tag '1.1' into develop

v1.1
factory_girl_rails
factory_girl using
link to heroku in readme
Merge branch 'hotfix/1.2'
Merge tag '1.2' into develop

v1.2
Merge branch 'release/rel1.2'