Cosmetic changes discovered during testing today
merge
Readds datatype editor killed in merge
Adds contentype alias to media and cotnent tree nodes
merged