fixed JSON test. changed current_or_guest_user to user
Merge branch 'master' of https://github.com/michballard/fhellow
fixed merge conflicts

Conflicts:
	app/controllers/api_controller.rb
fied merge conflicts
changed link to hompage fro FHELOW logo
Merge branch 'master' of https://github.com/michballard/fhellow