deleted
Merge branch 'master' of github.com:getahead/EcordCMS

Conflicts:
	admin.php