fix for not loading editor without allinone=0; it has been broken after a cleanup in 7317d4760a1261422470212eaa5c322fd1de6c88
quick fix for p2; restored type variable and method which returns the type
changed name of a method to make it more descriptive
Merge pull request #533 from Wikia/p2-fix-for-editor-bugid-100020

Editor wasn't loading or was loaded with bug described in FB#100020