aasdfasdfsafasfs
sdsd
Merge remote-tracking branch 'origin/huntercen' into dev

Conflicts:
	src/com/student/repository/StudentMessageControler.java
Merge remote-tracking branch 'origin/huntercen' into dev
Merge remote-tracking branch 'origin/canlee' into dev

Conflicts:
	src/com/student/repository/StudentMessageControler.java