Added Users controller to API

Conflicts:

	api/app/helpers/spree/api/api_helpers.rb
Merge git://github.com/spree/spree