Fix API access and brands controller spec
Create feature for JSON API and refactor step definitions
Merge branch 'fix_api' of github.com:emma-p/wiim into fix_api

Conflicts:
	spec/controllers/brands_controller_spec.rb
Merge pull request #11 from emma-p/fix_api

Fix api