added a little flesh CoreData
Merge branch 'master' of https://github.com/IFA11B/ITAdmin.git

Conflicts:
	templates/layout.tpl