bug fixed
Merge branch 'master' of github.com:go-xorm/xorm

Conflicts:
	engine.go
	session.go