merged, add new demo application, remove dead code