Model Generation

Generates the model file
Merge remote-tracking branch 'origin/master'

Conflicts:
	Development Deliverables/Qt Projects/parsing/parsing.pro.user