reverting changes
Merge branch 'master' of github.com:freecode/FreeVoteBot

Conflicts:
	src/main/resources/spring/modules.xml