geoadmin/mf-geoadmin3 — pull request #868 by gjn (2013-12-12 10:47:33+00:00)
Title: Fix deploybranch

The current deploybranch mechanisms doesn't work as expected.
- /prod/ url is not working
- some features are not working (because we have one single apache configuration for all our branches, we can't support the proxy and reverseproxy configuration that we use)
- deploying the branch to integration does not fully work

This PR fixes the the above issues. It also changes the general philosophy. A deployed branch is now treated exactly as code from a developer account. A deployed branch has its own apache configuration in /var/www/vhost/mf-geoadmin3/conf that points to the branches app.conf.

It can be reached at `http://mf-geoadmin3.int.bgdi.ch/*branch_name*/src/` and http://mf-geoadmin3.int.bgdi.ch/*branch_name*/prod/`. Replace instance type accordingly for test server.

The branches code is put under /var/www/vhost/mf-geoadmin3/private/branch/*branch_name*

Note that the deploybranch is now split:
`make deploybranch` will deploy the branch on test (for internal tests)
`make deploybranchint` will deploy the branch on test and on integration (for external tests)