Revert "Revert "Merge branch 'DAR-36' into dev""

This reverts commit 9780f9c1d116a43e43c9cb764b9199bc85039aa2.
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 branch 'bugid-100020-backport-from-release-155' into dev; backported p2 fixes after tracking cleanup (https://github.com/Wikia/app/pull/533)