Added category checking
Merge branch 'analyserrefactoring' of https://github.com/OpenACCEL/OpenACCEL into analyserrefactoring

Conflicts:
	src/model/script.js