Test changes.
Merge branch 'dev' of https://github.com/crew4ok/QRRecognizer into dev

Conflicts:
	src/main/webapp/WEB-INF/spring/root-context.xml