Renamed the appengine-endpoints to appengine-endpoints-guice-jpa because
of var naming conflict
App-engine archetype generated.
cleanup
Merge remote-tracking branch 'origin/master' into brandon-update

Conflicts:
	archetypes/appengine-endpoints/README.md
Merge pull request #85 from branflake2267/brandon-update

Brandon update