Added many changes
Merge branch 'refs/heads/local' into development

Conflicts:
	classes/class-mdg-type-stub.php