Merge origin/Rewrite into Rewrite

Conflicts:
	src/main/java/controller/CourseView.java
	src/main/java/dbModel/PrivateMessage.java
Merge origin/Rewrite into Rewrite

Conflicts:
	src/main/java/controller/CourseView.java
	src/main/java/dbModel/PrivateMessage.java
Merge origin/Rewrite into Rewrite

Conflicts:
	src/main/java/controller/CourseView.java
	src/main/java/dbModel/PrivateMessage.java
Merge origin/master

Conflicts:
	index.php
	libs/Bootstrap.php