update angular, prep merge w cp_api
merge new angular with cp_api stuff
changed header to display username, cleaned forgot password page