Merge tag '15.02.1' into upstream

Conflicts:
	Cura/gui/sceneView.py
	README.md

1 files changed, 3 insertions, 6 deletions

diff --git a/README.md b/README.md
index 260ad1f7d9..1b75e5b140 100644
--- a/README.md
+++ b/README.md
@@ -93,17 +93,14 @@ To build and install Cura, run the following commands:
 ```bash

 git clone https://github.com/daid/Cura.git

 

-sudo apt-get install python-opengl

-sudo apt-get install python-numpy

-sudo apt-get install python-serial

-sudo apt-get install python-setuptools

-sudo apt-get install curl

+sudo apt-get install python-opengl python-numpy python-serial python-setuptools python-wxgtk2.8 curl

 # Run this also if you're building for 32bit Debian

 sudo apt-get install gcc-multilib g++-4.7-multilib

 

 cd Cura

 

-sudo ./package.sh debian_amd64          # or debian_i386 for 32bit

+./package.sh debian_amd64          # or debian_i386 for 32bit

+# this will prompt for your root password to run dpkg-deb

 

 sudo dpkg -i ./scripts/linux/cura*.deb

 ```