#5 the newest changes
Merge branch 'develop' of github.com:ab2014-rails/yakut into develop