Merge branch 'master' of github.com:theodi/frontend-www

Conflicts:
	config/routes.rb
Merge branch 'master' of github.com:theodi/frontend-www
Redirect to content API when json is requested
Merge pull request #100 from theodi/feature-json-stuff

Redirect to content API when json is requested