add user tests
Merge branch 'dev' of https://github.com/Cicero-vote/Activity-Calendar into usersignin
tests
Merge pull request #11 from Involve-Seattle/usersignin

Usersignin
calendar
Merge branch 'dev' of https://github.com/Involve-Seattle/Activity-Calendar into dev
calendar stuff
merge
all passing
merged with calendarviews branch