re-added models for water calculation. on the wrong branch of course.
Filled out controllers for User and Activity.
Fixed some link loop issues.
Added the edit page for users.
added edit and update pages for user.
Changed password confirmation to only work on user creation.
Finished User and dashboard views.
adding activities to dashboard.
added ability to sum up activties.