Feature/editor 2014 12 03

Ready to publish for 2014-12-03 :-) ++@aanoaa