Popups and stuff
Merge branch 'master' of https://github.com/OxfordCS2014BestestProject/InstantFeedback

Conflicts:
	Lectures+
Student/src/com/InstantFeedback/Student/StudentLectureActivity.java