Finished All Model Tests, Starting on Controller Tests

We are currently sitting at 80% code coverage for the tests which is
very good. Should be at 100% tommorow night.
Merge branch 'master' of https://github.com/WilsonAus/Part2

Conflicts:
	imageupload/spec/models/friendship_spec.rb