Merge branch 'Wikinode' of https://github.com/CyberCRI/KnowNodes into Wikinode

Conflicts:
	clientApp/js/controllers.js
Merge branch 'Wikinode' of https://github.com/CyberCRI/KnowNodes into Wikinode