Merge remote-tracking branch 'origin/master' into ubuntu12
Merge remote-tracking branch 'origin/master' into ubuntu12
[ubuntu 12]

- Temp
	modified:   Auxiliaries/install.py
Merge remote-tracking branch 'origin/develop/installer' into develop/installer

Conflicts:
	Auxiliaries/install.py