loo model changes
Merge branch 'master' of github.com:mklemme/freepee
fixed gemfile.lock