fixed macro bug that could result in ill-formed code and added test cases
Merge branch 'master' into refactor-hierarchy

Conflicts:
	REScalaTests/test/react/test/MacroTestSuite.scala