Merge branch 'develop' into Diegos_work

Conflicts:
	Themes/default/css/breeze.css

Signed-off-by: Suki <suki@missallsunday.com>
Merge github.com:MissAllSunday/Breeze into Diegos_work