little
fixes #37 fixes #39
Merge branch 'dev'

Conflicts:
	server/route/BetRoute.js