New branching strategy.
New branching strategy.

Merge branch 'developer' of https://github.com/bcgov/gwells

bcgov/gwells,bcgov/gwells,rstens/gwells,bcgov/gwells,rstens/gwells,bcgov/gwells,rstens/gwells,rstens/gwells