Update #31
Update #32
2014-12-07
Merge remote-tracking branch 'origin/master'

Conflicts:
	Aircraft Academy/DataFolder/data.waData
	Aircraft Academy/SymbolTable.waSym
	Aircraft Academy/SymbolTable.waSymData