Moved usage function to main because it implementation specific.
Fixed the test_jar test to fail when not all records are free.
Fixed conflict.
Merge branch 'master' into feature/server