Merge pull request #59 from maksimov/2014.05

Versions update to 2014.05.1-SNAPSHOT
:lipstick: Removing dead-code and other warnings