Update 2014-12-02

Update after JPS-Project-Milestone-Meeting-2