added button for smartphones + username visible
add reset management
fix remarks for 9bc6e35
add resetPassword
code cleaning
code cleaning
websocket proxying
add log
code cleaning
modify login
Merge branch 'master' of ssh://github.com/mycozycloud/cozy-proxy
modify register
use express instead of connect
Merge branch 'feature/improveLoginView' of github.com:aenario/cozy-proxy into aenario-feature/improveLoginView

Conflicts:
	proxy.coffee
fix remark on merge faillure
Merge branch 'feature/improveLoginView' of git://github.com/aenario/cozy-proxy into aenario-feature/improveLoginView

Conflicts:
	proxy.coffee
Merge branch 'aenario-feature/improveLoginView'
Merge pull request #5 from mycozycloud/feature/log

add log
Merge branch 'master' into feature/accounts

Conflicts:
	test/password_keys_test.coffee
Merge branch 'master' of github.com:mycozycloud/cozy-proxy