merge
Merge branch 'develop' of github.com:ab2014-rails/elmas into develop
fixed