Replaced info by glossary in tags, note that clicking tags still leads to information
Merge branch 'master' of github.com:ictofnwi/steep into development
If Person has user linked, the logged in user will be referred to through person page
Removed parsley from example settings
Merge branch 'master' of github.com:ictofnwi/steep into development
Merge branch 'master' into development

Conflicts:
	search/admin.py
	search/models.py
	search/views.py
Fixed two more merge issues
Added check for person-user link
Added migration for user field in person
Merge branch 'master' into development
New askquestion look and feel for projects.
Fixed tags in question form (issue #16).
More tidy handling of try, except case
Added safety check in case our assumption about user-person links is not true