Merge branch 'link_icon_header'
availability options updated
Merge branch 'availability' into nightly

Conflicts:
	controllers/default.py