Fixed broken stuff
Merge branch 'develop' of https://github.com/nhandyal/scia into develop

Conflicts:
	public/js/dist/SCIA.min.js