cokolwiek
Merge branch 'master' of https://github.com/rysiekblah/EPAMHackathon2014

Conflicts:
	target/surefire-reports/TEST-com.realcoders.bot.test.CanaryTest.xml
	target/surefire-reports/com.realcoders.bot.test.CanaryTest.txt