added functionality to calculate a tank's current state
added authorization security when an admin user doens't have an account or any user has a temporary password
Changed CurrentUser method to check against the user's id AND SessionToken
Merge branch 'model' into dev