refactoring
Merge commit '5b1ced8a7d25bd403c2103c618e95e74bedbb941'

* commit '5b1ced8a7d25bd403c2103c618e95e74bedbb941':
  refactoring

Conflicts:
	app/scripts/directives/host.js
	app/scripts/services/hostManager.js