Add menu tag
Merge branch 'master' of github.com:funkybob/django-linkage

Conflicts:
	linkage/templatetags/linkage.py
Regularise template tags