After the conference call on 2013-07-17

Signed-off-by: iptc <mdirector@iptc.org>
Merge branch 'master' of https://github.com/iptc/newsinjson-dev