skos concept/collection view
Merge remote-tracking branch 'origin/master'

Conflicts:
	atramhasis/views.py
merge view