Merge branch 'master' into post-certification

* master: (35 commits)
  Fix the create admin user rake task
  add test case for admin user defect
  Bumping the versions of HDS and QME
  Providing documentation with Apipie
  Adding children to the show action on provider
  Improved support for different provider ids on OPML import
  document providers addition
  standardize on :providers array for supplying provider ids to queries
  corrected fixture for provider tree import unit test
  modifying provider tree import to suit OPML format
  initial implementation of OPML provider tree import
  Correcting documentation
  Clarifying the usage of POST /patients
  Style changes based on @carpeliam's feedback
  Updating the Apipie documenntation
  Documenting the QueriesController
  Starting to document the popHealth API
  add dashboard to provider view
  show a count of selected measures for each category on dashboard
  Allow popHealth to run when not in a git repository
  ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/admin_controller.rb
Merge branch 'cms_and_nqf_ids' into post-certification

* cms_and_nqf_ids:
  search by category or measure titles #8
  use cms/nqf - name format for measures #7
Merge branch 'sort_submeasures' into post-certification

* sort_submeasures:
  sort submeasures in UI. #10
Merge branch 'continuous' into post-certification

* continuous:
  continuous variable measure details #11
  use cms/nqf - name format for measures #7
  add ipp to continuous variable measures on dashboard. #9
  adding listing of continuous variable measures to dashboard. includes observation value, measure population and labels #9