trying to set the calendar
fixing merge
adding style to paginate
Merge branch 'fix' into dev_thiago

Conflicts:
	app/assets/javascripts/calendar.js
	app/views/home/index.html.haml
Calendar =D