Merge branch 'neo4j-Externalization'
Merge remote-tracking branch 'origin/master'
fixed bugs, unique id
Merge remote-tracking branch 'origin/uniqueIdDocent'

Conflicts:
	lib/resources/docentResource.js