Merge webapp and portal-web projects

[tucotuco]

Need to start deploying webapp as a module using gcloud. Right now there are two repositories for the web app. This one, in which the latest code is still being developed, and https://github.com/VertNet/portal-web. Good documentation on deployment practices are in https://github.com/VertNet/portal-web.

Will need help from Javi to make sure this is done correctly.

[tucotuco]

Merge all outstanding branches to master first. Current versions all deployed from webapp, including prod, tuco, and pagodarose.

[tucotuco]

Pull request created from branch feature/laura-traits-ui. Need to resolve conflicts before proceeding.

[tucotuco]

Need to check with Javi about portal-web.yaml configuration stolen from portal-web repo.

[tucotuco]

Conflicts resolved with branch feature/laura-traits-ui. Merged. Master now reflects the portal as deployed with traits. Still need to consult Javi about portal-web.yaml, https://github.com/VertNet/portal-web.

[tucotuco]

Will want to deploy http://api.vertnet-portal.appspot.com/ from a module. As of today, it was deployed from this code base after turning on the api in portal-web.yaml.