All modules working, about to pillage interface
Merge branch 'master' of https://github.com/dynama/prototype

Conflicts:
	dynamaPROTO/mySQL.py~
	dynamaPROTO/nameBasedAnalysis.py~
Fixed merge, before Gui pillaging started.