Add template option to Message generator
Fix template method for Interface generator
Fix Reflector guide page
Merge branch '3.3/develop' into 3.3/master