Refactor directory for new archetype
Merge remote-tracking branch 'origin/master' into
brandon_activitiesandplaces

Conflicts:
	archetypes/gwt-activitiesandplaces/README.md
Merge pull request #13 from branflake2267/brandon_activitiesandplaces

Brandon activitiesandplaces