Feature/editor 2014 12 12

ready to publish jellypo's article