Merge pull request #209 from maksimov/2014.05

Changed interval and timeout to type int (seconds), added javadoc.
Removed incorrect annotations
Merge branch '2014.05' of github.com:maksimov/dasein-cloud-core into 2014.05