Merge from github 15.02.14 23-41
Добавлена страница ошибки
merge
Merge origin/master

Conflicts:
	src/main/java/ru/desu/home/isef/controller/ActivationController.java
	src/main/webapp/login/index.zul
	src/main/webapp/work/mytasks/mytasks-mvc.zul
	src/main/webapp/work/profile/profile-mvc.zul
	src/main/webapp/work/todolist/todolist-mvc.zul