view update
Merge branch 'development' of github.com:garcha/rails-test into development