Error fixing
Merge branch 'master' of https://github.com/OxfordCS2014BestestProject/InstantFeedback

Conflicts:
	Lectures+
Lecturer/src/com/InstantFeedback/Lecturer/DatabaseHandler.java