acertos datepicker
Merge branch 'master' of https://github.com/monteirokassia/smartApp

Conflicts:
	app/assets/javascripts/application.js
Merge branch 'master' of https://github.com/monteirokassia/smartApp
dashboard