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

Conflicts:
	docs/QuickStart.md
	docs/QuickStartEn.md
	examples/cache.go
	examples/maxconnect.go