Merge branch 'master' of github.com:myplaceonline/myplaceonline_rails
Merge branch 'master' of github.com:myplaceonline/myplaceonline_rails