Merge branch 'release/1.0'
Merge branch 'develop' of ssh://github.com/nicolasramy/hack4good into develop
fields added to users table
Merge branch 'develop' of ssh://github.com/nicolasramy/hack4good into develop