Merge branch 'wataori' of https://github.com/wataori/server_24 into wataori
implement json output of user data
Merge branch 'wataori' of https://github.com/wataori/server_24 into wataori

Conflicts:
	app/controllers/key_phrases_controller.rb