Change to Team Hydra
Merge branch 'master' of github.com:Sym-Link/local_manifest

Conflicts:
	pyramid.xml
Team Hydra