trying to sync
Merge branch 'master' of https://github.com/CommonAccord/Alpha

Conflicts:
	Doc/core/include.php