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

Conflicts:
	src/main/java/com/springapp/service/SimplePollManager.java
Merge remote-tracking branch 'polling-system-heroku/master'
Merge branch 'master' of https://github.com/mos91/pollingsystem

Conflicts:
	src/main/java/com/springapp/service/SimplePollManager.java
Merge remote-tracking branch 'polling-system-heroku/master'

Conflicts:
	src/main/java/com/springapp/domain/VoteOption.java