Adding basic sanity test for /feed
Merge remote-tracking branch 'upstream/master' into HEAD
Adding format extension to URLs (#niryariv/38)
Fixing tests to work with new .json/.atom routes
Merge branch 'master' of github.com:niryariv/opentaba-server
Fixing tests to work with new .json/.atom routes
Merge branch 'feature/route-format-suffix' of github.com:shevron/opentaba-server into feature/route-format-suffix

Conflicts:
	Tests/functional_tests/test_return_json.py
Merge pull request #39 from shevron/feature/route-format-suffix

Adding type suffix to routes