Merge origin/master

Conflicts:
	src/java/com/view/CreateExamPaperView.java