Changes in view and Customfields
Merge branch 'issue-24'