bug new
feature fix 1
feature fix 2 - conflict?
Merge branch 'feature/alexbew' into develop
Merge branch 'release/next7' into develop

Conflicts:
	b