Various fixes

Various changes made during the online run of nov 2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	Code/gui/mframe.pyc