Merge tag '15.01-RC5' into upstream

diff --cc build_app.py
Simple merge

diff --cc package.sh
index 7e77a787d22829654e00bd0f91fb85e95cf9146e,14086e5bf12394eb6447864ce197c97bd4b14bc4..b647b3e7cc50c69070167d9fc6d6f53d78b5ec14
--- 1/package.sh
--- 2/package.sh
+++ b/package.sh
@@@ -19,15 -19,9 +19,15 @@@ BUILD_TARGET=${1:-none
  ##Do we need to create the final archive
  ARCHIVE_FOR_DISTRIBUTION=1
  ##Which version name are we appending to the final archive
- export BUILD_NAME=15.01-RC4
+ export BUILD_NAME=15.01-RC5
  TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
  
 +##Revision
 +export REVISION=1.19
 +
 +##Git commit
 +GIT_HASH=$(git rev-parse --short=4 HEAD)
 +
  ##Which versions of external programs to use
  WIN_PORTABLE_PY_VERSION=2.7.2.1