Created error page
Merge origin/master

Conflicts:
	src/java/controller/MainController.java