Merged develop into master and fixed the files that had conflicts

.travis.yml

@@ -0,0 +1,73 @@
+services:
+    - docker
+
+env:
+  global:
+    - ON_TRAVIS=true
+    # - IMAGE=elpaso/qgis-testing-environment
+    # - IMAGE=boundlessgeo/qgis-testing-environment
+    - IMAGE=kartoza/qgis-testing
+
+  matrix:
+    # Tags from elpaso
+    # - QGIS_VERSION_TAG=release-2_8
+    # - QGIS_VERSION_TAG=release-2_14
+
+    # Tags from boundlessgeo
+    # - QGIS_VERSION_TAG=release # Current 2.14
+    # - QGIS_VERSION_TAG=master_2 # Current 2.17
+    # - QGIS_VERSION_TAG=master # Current 3.0
+
+    # Tags from kartoza
+    - QGIS_VERSION_TAG=boundlessgeo-2.14.7
+
+language: python
+
+cache:
+  directories:
+    - $HOME/.cache/pip
+
+python:
+  - "2.7"
+
+virtualenv:
+  system_site_packages: true
+
+branches:
+  only:
+    - master
+    - develop
+
+addons:
+  apt:
+    packages:
+      - git
+      - python-software-properties
+
+before_install:
+  - docker pull ${IMAGE}:${QGIS_VERSION_TAG}
+
+install:
+  - pip install --upgrade pip
+  - pip install --upgrade pep8
+  - docker run -d --name qgis-testing-environment -v ${TRAVIS_BUILD_DIR}:/tests_directory -e ON_TRAVIS=${ON_TRAVIS} -e DISPLAY=:99 ${IMAGE}:${QGIS_VERSION_TAG}
+  - sleep 10
+  - docker exec -it qgis-testing-environment sh -c "qgis_setup.sh parcel_plugin"
+
+script:
+  - docker exec -it qgis-testing-environment sh -c "qgis_testrunner.sh test_suite.test_package"
+  - make pep8
+
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/02b5a8e3e7c3c47df25c
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: always    # options: [always|never|change] default: always
+
+  email:
+    - [email protected]
+    - [email protected]
+
+sudo: false

Makefile

@@ -115,3 +115,13 @@ clean:
 # build documentation with sphinx
 doc: 
 	cd help; make html
+
+# Run pep8 style checking
+#http://pypi.python.org/pypi/pep8
+pep8:
+	@echo
+	@echo "-----------"
+	@echo "PEP8 issues"
+	@echo "-----------"
+	@pep8 --version
+	@pep8 --repeat --ignore=E203,E121,E122,E123,E124,E125,E126,E127,E128,E402 . || true