Merge branch 'patch-3' into develop
Merge remote-tracking branch 'GaryJones/develop' into develop
make `svn update|copy|delete` quiet
accept mine for asset conflict

For some reason there's an update conflict after adding assets. This command accepts the local files.