Merge remote-tracking branch 'origin/development' into development
* Merged vufind master with zf2.2 update (contains conflicts)
* Fix: Template naming changed (replaced all dots "." with dashes "-") to prevent zf2.2 to think the dot marks the file extension
* Code style cleanup
* Change: Use new connector class from serials solutions
* Code cleanup
* Added new files from merge which were missing in the merge commit
Merge branch 'feature/zf22' into development