Fixed he article controller tests
Merge branch 'master' of github.com:ofer987/Numerous
Fixed bug where Photo#show did not work. Now the links for the various photo sizes reference the non-cached photos. And the filenames do not contain an appended hashtags.