fix bug
Merge remote-tracking branch 'origin/master'
update
fix android input style
update
update
Merge branch 'master' of github.com:wondger/eureka
fix bug
Merge remote-tracking branch 'origin/master'
update
fix bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/session.js
fix bug