Remove usage of newly deprecated Guava methods
Merge pull request #60 from hi3g/update_deprecated_guava

Remove usage of newly deprecated Guava methods
Tests should be done for TSDB class.
Minor changes. Camel-Case and also refined tests so that the order should not matter only that the value is checked.
Minor changes
Merge branch 'TSDB_tests_update' into next_storage

Conflicts:
	test/core/TestTSDB.java
	test/storage/MemoryStore.java
Merge remote-tracking branch 'origin/next_storage' into next_storage
removed unnecessary semicolon
Merge pull request #63 from hi3g/remove_semicolon

removed unnecessary semicolon
Fixing the merge conflict
Merge branch 'TSDB_tests_update' into next_storage
Second time fixing this merge conflict
fixed some merge conflicts