remove conflict
Make test script
Add work directory for test to gitignore
Fix jenerated server template. fixes #319
Support include
Regenerate classifier
Regenerate anomaly
Regenerate recommender
Regenerate regression
Regenerate graph and fix name of member variable
Remove convert method
Remove redandant make_pair
Merge branch 'master' into new-jenerator
add java.ml
Remove key_manager::vacant_
Make key_manager's operator= implicitly-defined
Use non-local static variable
Remove anonymous namespace
Rename vacant
Add non-member swap