more stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	chemX/chemInterpreter/views.pyc