Adding code to allow JSON to be used to sign up
Is that better?
Merge branch 'master' of github.com:Interoctavo/yafalla

Conflicts:
	app/controllers/users_controller.rb
Merge branch 'master' of github.com:Interoctavo/yafalla

Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
Merge branch 'master' of https://github.com/dparnell/yafalla

Merging Daniel's commits