replication
merge conflict for replicationManager.java
repair
Merge branch 'master' of https://github.com/edtubillara/Helenus
added rm