Merge origin/master
Merge origin/master

Conflicts:
	src/com/template/canvas/rules/StudentRule.java