Merge branch 'master' of https://github.com/mos91/pollingsystem

Conflicts:
	src/main/java/com/springapp/service/SimplePollManager.java