Mac Version
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/controller.py
	Classes/dynamics.py
	input.py
Added POSCAR reading support
several improvements