Merge branch 'master' of github.com:kartoza/parcel_plugin into develop

� Conflicts:
�	.travis.yml
�	cogo_dialogs.py
�	scripts/database_setup.sql
�	scripts/sample_data.sql