Merge origin/Rewrite into Rewrite

Conflicts:
	src/main/java/controller/CourseView.java
	src/main/webapp/WEB-INF/web.xml
Merge origin/master

Conflicts:
	.htaccess
	config/paths.php
	controllers/blog.php
	controllers/error.php
	controllers/help.php
	controllers/index.php
	controllers/login.php
	controllers/user.php
	index.php
	libs/Bootstrap.php
	libs/Controller.php
	libs/Database.php
	libs/Model.php
	libs/Session.php
	libs/View.php
	models/help_model.php
	models/login_model.php
	models/user_model.php
	public/css/main.css
	public/js/jquery.js
	public/js/main.js
	views/blog/index.php
	views/dashboard/index.php
	views/error/index.php
	views/footer.php
	views/header.php
	views/help/index.php
	views/login/index.php