Merge branch 'Jasons-Branch'
Merge branch 'master' of https://github.com/yorkshiregeek/WJPS_Portal

Conflicts:
	Classes/tableclass.php
	Classes/templateclass.php
	directory.php
	js/jquery-draggable.js
	js/jquery-ui.js
Merge branch 'master' of https://github.com/yorkshiregeek/WJPS_Portal

Conflicts:
	Classes/formsclass.php
	Classes/positionsclass.php
	Classes/tableclass.php
	Classes/userclass.php
	css/styles.css
	portal.sublime-workspace