Translate attribute key names
Translate block type names
Translate permission key names
Translate access entity labels
Translate attribute set names
Translate attribute type names
Translate intelligent search result entries
Merge branch 'master' of bmatzner

git://github.com/bmatzner/concrete5

Conflicts:
	web/concrete/core/models/page.php