Merge pull request #357 from rostafiychuk/master

cleanup
hardcoded timeouts reverted
hardcoded timeouts reverted
test timeout increased
Merge pull request #358 from pisaychuk/analysis

Analysis, tests fixes
minor refactoring
simplifying Consumer.java by passing around MapMessage instead of HashMap<String, String>
removing infinite loop, logging less info
renaming Consumer class to JmsMessageConsumer
renaming variables
renaming method
renaming variables
renaming/reordering variables
using feedType for switching
rearranging if statements
fixing issue
removing feed parameter
using enum's method for time arithmetic
removing appender stuff
simplifying if statement