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

Conflicts:
	admin.php
robots added
Merge remote-tracking branch 'remotes/origin/master' into new