update to current rake version
new gemfile.lock
Merge branch 'master' into add_themes