learning macros in hierarchies
Merge remote-tracking branch 'origin/master'

Conflicts:
	scala/macrodef/src/main/scala/MacroContainer.scala