Merge pull request #26 from branflake2267/brandon_module

Brandon module
Merge remote-tracking branch 'origin/master' into brandon_module
GWT Archetype fixed and working