fixed indentation in test output; fixed if/while output (except else if)
Merge branch 'dev' of github.com:djrieger/mjplusplus into dev

Conflicts:
	ast/ClassDeclaration.cpp