some new changes
Merge branch 'master' of https://github.com/ajency/Betdog

Conflicts:
	inc/content_myaccount.php