Merge branch 'wataori' of https://github.com/wataori/server_24 into wataori
add user_id to responding json
respond user_id when loged_in
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
respond icon when loged_in
update
Merge branch 'wataori' of https://github.com/wataori/server_24 into wataori
implement sort
add unicorn configurations
update
Merge pull request #2 from wataori/wataori

Wataori