Change coding style: Place 'in' keyword end of lines
Merge branch 'master' of https://github.com/mizon/mj

Conflicts:
	lib/action.ml
	test/action_test.ml
	test/field_test.ml
Add .annot files to the clean target