Test cleaning
Merge branch 'master' of https://github.com/romapsih/Master

Conflicts:
	.idea/artifacts/Master_war_exploded.xml
	.idea/workspace.xml
	Master.iml
	pom.xml
Fix calculation