Some minimal changes & fixes

- Last minute changes >.<
Merge branch 'develop' of github.com:guluc3m/gul-gultalks into develop

Conflicts:
	app/views/partials/_calendar.html.haml