no message
Merge branch 'develop' into feature/Bootstrap-CSS

* develop:
  Trying fix for negative time to logout window issue...
work in progress
no message
Merge branch 'develop' into feature/Bootstrap-CSS

* develop:
  Fixed CRLF issue with PC files
  Moved concept inactive warning
  remove concept effective time
  remove concept effective time
  styling change for popup
  Fixed several import issues
  Got import working again!
  forcing change to commit
  forcing change to commit
  no message
  dist assets

Conflicts:
	app/styles/app.css
	dist/assets/refset.css
Merge branch 'develop' into feature/Bootstrap-CSS

* develop:
  Added ability to import a single concept from the Snomed CT browser. Removed call to get concept data since we now have what we need in the get Refset call
work in progress
work in progress
Merge branch 'develop' into feature/Bootstrap-CSS

* develop:
  Fixed filename for export
  changes to new user management URL
  Added ability to import a single concept from the Snomed CT browser. Removed call to get concept data since we now have what we need in the get Refset call

Conflicts:
	app/templates/refsets/new.hbs
	dist/assets/refset.js
restyling work in progress. Refset list page done. Login / Register modal done. Header / Footer done.
restyling work in progress.
Refset display done. But still need to to member view in edit mode and the controls panel
Much of the way through restyling the app
Merge branch 'feature/Bootstrap-CSS' into develop

* feature/Bootstrap-CSS:
  Much of the way through restyling the app
  restyling work in progress. Refset display done. But still need to to member view in edit mode and the controls panel
  restyling work in progress. Refset list page done. Login / Register modal done. Header / Footer done.
  work in progress
  work in progress
  no message
  work in progress
  no message

Conflicts:
	app/index.html
	app/templates/login.hbs
	dist/assets/refset.js
	dist/index.html
Merge branch 'develop'

* develop:
  Much of the way through restyling the app
  restyling work in progress. Refset display done. But still need to to member view in edit mode and the controls panel
  restyling work in progress. Refset list page done. Login / Register modal done. Header / Footer done.
  work in progress
  work in progress
  no message
  work in progress
  no message