Feature/editor 2014 12 11

sorry for late :(