fix timezone
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	bet4fun.iml
	grails-app/services/happybet/BetService.groovy
	grails-app/views/bet/bet.gsp
	grails-app/views/bet/index.gsp
	grails-app/views/bet/result.gsp
fix currency