Developing...
Merge branch 'stage' into development

Conflicts:
	my_patch.html