Adding Encounters  module
Merge branch 'master' of https://github.com/cwoolner/shart-finder

Conflicts:
	app/api/api-service.js
	app/main.js
	app/router-config.js