added ssl
fixed merge conflict
got the devise capybara rspec login to work
basic tests for photo pages (except functional edit)
fixed merge conflict in environment/production