added styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/design/css/reset.css
updated event calendar