Some view edits
Merge branch 'master' of https://github.com/aguazales/childcare
Updated the View tables
Merge branch 'master' of https://github.com/aguazales/childcare

Conflicts:
	site/childcare/app/views/incomes/edit.html.erb
	site/childcare/app/views/incomes/index.html.erb