Eduardo Commit
merged
Merge branch 'master' of https://github.com/renatabrasil/raiseit-web

Conflicts:
	app/views/entry_records/_form.html.erb