crateit-45 Fix up merge error (forgot to take out alert)
Merge branch 'master' of github.com:IntersectAustralia/owncloud