Merge branch 'login_ui_updates'; fixes #200
Make username and email show up as required fields.
Update registration page to reflect actual database requirements.
Strip unnecessary characters and backslashes from the bundle.
Account info page subtext was incorrect, min username length is 3 characters.
Update icons in Account info page to match the registration page.
Add string for unapproved users.
Use the help-block bootstrap class for subtext.
Hide password confirmation field unless user is changing their password.
Render the shared header instead of duplicating the logic in the edit page.
Username and email should show as required fields in the account info page.
Update wording for inactive and not approved users.
Merge pull request #199 from rbclark/fixRegisterView

Misc Registration and User Edit Fixes
add hook for displaying # encounters, shorten up patient id display
display number of encounters, based on the result from the numerator
update test to reflect need for submeasure data in results view
Merge branch 'patient_eoc_view'

Rebasing and merging pull request #195
Added bootstrap classes to Measures Admin view
Merge branch 'measures-bootstrap'

Rebasing and merging pull request #203
Changed active providers to be filled circles of same radius.