adding premitiveTypes
Merge remote-tracking branch 'origin/master'

Conflicts:
	eclipse-project/src/com/parser/mechanix/MechanixParser.java