Merge branch 'master' into development

Conflicts:
	.gitignore
	Repetier/Commands.cpp
	Repetier/Extruder.cpp
	Repetier/Repetier.pde
	Repetier/Reptier.h
	Repetier/gcode.cpp
	Repetier/gcode.h
	Repetier/motion.cpp
	Repetier/ui.cpp
	changelog.txt
	src/ArduinoAVR/Repetier/Configuration.h
	src/ArduinoAVR/Repetier/pins.h
	src/ArduinoAVR/Repetier/ui.h
	src/ArduinoAVR/Repetier/uimenu.h