changed perm to be more consistent with current implementation
initial implementation of expertise view
Merge branch 'develop' of ssh://github.com/ngageoint/geoq into develop

Conflicts:
	geoq/accounts/urls.py
Merge branch 'develop' of ssh://github.com/ngageoint/geoq into develop

Conflicts:
	geoq/accounts/urls.py
Changes to allow us to draw lines on the edit page. Issue #257