uuu
uuu
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/api/sessions_controller.rb
Merge branch 'master' of https://github.com/meshoui/webserver

Conflicts:
	app/controllers/api/sessions_controller.rb