Updates
Merge branch 'master' of https://github.com/jparaskakis/Unipi

Conflicts:
	Web Programming/components/plugins/controller/slider.plugin.js
	Web Programming/components/plugins/model/slider.php
	Web Programming/components/settings/controller/settings.json
	Web Programming/components/settings/view/settings.lib.js
	Web Programming/images/logo.png
	Web Programming/index.js
	Web Programming/index.php
	Web Programming/shared/site_template.css
	Web Programming/shared/template.css