finish schedule
adding color tab
add margin from navbar
Merge remote-tracking branch 'origin/release_3_1'

Conflicts:
	css/core.css