Merge pull request !141 from reset/feature/cl
Conflicts: src/com/engine/organization/service/impl/DemoServiceImpl.java
Merge pull request !129 from reset/feature/cl