Changing branching system

Merging develop into master