switching to active
Merge branch 'master' of github.com:voxoz/release_server

Conflicts:
	apps/releaseman/rebar.config