fixed kevin's mess with contest foreign key naming, tests for user/contest/photo association
moved faker/factorygirl to development/test
Merge branch 'master' of https://github.com/Dawenster/custom_cam