Merge branch 'master' of github.com:Zefiros-Software/BSPLib

# Conflicts:
#	.travis.yml
#	LICENSE.md
#	README.md
#	docs/index.md
#	mkdocs.yml
#	script/appveyor-build.bat
#	script/install-unix.sh
#	script/travis-build.sh
#	test/bsp.licenseheader

.travis.yml

@@ -52,7 +52,7 @@ install:
 script:
     - bash script/travis-build.sh
 after_success: 
-  - if [[ "$TRAVIS_BRANCH" == "master" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash script/deploy-docs.sh; fi
+  - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_OS_NAME" == "linux" ]]; then bash script/deploy-docs.sh; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" && "$TYPE" = "coverage" ]]; then codecov; fi    
 notifications:
     slack:

mkdocs.yml

@@ -3,7 +3,7 @@ site_url: http://www.bsplib.eu
 repo_url: https://github.com/Zefiros-Software/BSPLib
 site_description: BSPLib a fast and easy to use parallel computation libary.
 theme: united
-copyright: Copyright © 2017 Zefiros Software.
+copyright: Copyright © 2017 Zefiros Software
 google_analytics: ['UA-29999374-2', 'www.bsplib.eu']
 theme_dir: docs/style
 

test/bsp.licenseheader

@@ -1,6 +1,6 @@
 extensions: .h .cpp .cc .hpp
 /**
- * Copyright (c) %CurrentYear% Zefiros Software
+ * Copyright (c) %CurrentYear% Zefiros Software.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

zpm.lock

@@ -0,0 +1,26 @@
+
+{
+    "dependencies": [ 
+    {
+        "hash": "3058c123c01f008d5e498eac7bf5811d132eab70",
+        "name": "Zefiros-Software/Armadillo",
+        "tag": "master",
+        "type": "library",
+        "version": "@head"
+    }, 
+    {
+        "hash": "aa39bc09c2d5994c6fb03f6a9774df51c89918a3",
+        "name": "Zefiros-Software/PlotLib",
+        "tag": "1.0.8",
+        "type": "library",
+        "version": "1.0.8"
+    }, 
+    {
+        "hash": "5e7fd50e17b6edf1cadff973d0ec68966cf3265e",
+        "name": "Zefiros-Software/GoogleTest",
+        "tag": "master",
+        "type": "library",
+        "version": "@head"
+    }],
+    "name": "Zefiros-Software/BSPLib"
+}