generated Events, Activities, Shifts, and Volunteers models
'no implicit conversion of nil to string' error in user model test only when running integration tests, too
Merge pull request #6 from curiousepic/master

generated Events, Activities, Shifts, and Volunteers models
login integration test with errors
fixed merge conflicts