Interim checkin.
Merge branch 'origin/develop'

Conflicts:
	views/cyjs_visualize_network.ejs
Finish security-enhancements