Merge branch 'fix' into dev_thiago
Fixes
fix
Merge branch 'fix' into dev_thiago

Conflicts:
	app/assets/javascripts/calendar.js
	app/views/home/index.html.haml
Calendar =D
Merge branch 'fix' into dev_thiago
Merge branch 'dev_thiago' of https://github.com/thiagorpp/viamundi into fix
calendar fix
changing styles on calendar
Merge branch 'dev_thiago' of https://github.com/thiagorpp/viamundi into fix