Implement link add and del, fix consolidation and many other features.
Merge branch 'orderAndDeletion'

Conflicts:
	.gitignore