Andrew's M3 Functionality
Merge branch 'master' of https://github.com/joshterrell805/EClass

Conflicts:
	implementation/source/python/view/LayerManager.py
Merge branch 'master' of https://github.com/joshterrell805/EClass