Add class definitions
Merge http://github.com/threonorm/mpri13

Conflicts:
	src/elaboration/elaborateDictionaries.ml