Ready for merge
Merge remote-tracking branch 'origin/master' into InsertResults-Swing

Conflicts:
	Askja/src/com/askja/swing/HomePage.java
ExercisePage, AdminSpecificExercise and helperclasses
Merge branch 'InsertResults-Swing'

Conflicts:
	Askja/.classpath
	Askja/bin/.gitignore
	Askja/src/com/askja/dao/impl/ExerciseResultDAOimpl.java
	Askja/src/com/askja/swing/HomePage.java