p8 from june_2014 done
Merge branch 'june_2014' of github.com:secretariat/muzkom into june_2014