no changes
Merge branch 'master' into karina
Merge pull request #60 from spotfinder/mike

updated password signup rules to require min 6
changed the admin filter
Merge pull request #61 from spotfinder/karina

Karina
updated database