Fix method name.
Merge branch 'development', remote-tracking branch 'origin'

Conflicts:
	portcullis/models.py - Change is_editable to get_editable.
Merge branch 'development'
Merge branch 'master' of github.com:visgence/portcullis into development
Merge branch 'development'
Added back chucho submodule
Merge branch 'master' into development