Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	tests/UserDBTest.php

Added SQL for allowing Roles
Merge origin/master

Conflicts:
	SQL/createDB.sql
	csv/loadcsv.php
	csv/mockCSV.csv
	tests/LoadCsvTest.php