Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/java/ru/qatools/school/vorobushek/models/UserContext.java
	src/main/java/ru/qatools/school/vorobushek/service/DatabaseProvider.java