many changes
Merge branch 'master' of github.com:giveydev/givey-rails