MISC: Adds features for CRATEIT-46 and CRATEIT-49
Merge branch 'master' of github.com:IntersectAustralia/owncloud