small changes
Merge branch 'master' of https://github.com/melezhik/pjam-on-rails
small-fixes
ordering-fixes
up