added new/moved templates
Merge branch 'development' of C:\xampp\htdocs\vufind with conflicts.
Merge remote-tracking branch 'origin/development' into development