more consistent naming of views
Merge branch 'syncing_models' into IDOC_demo

Conflicts:
	kalite/securesync/urls.py