Use proper plugin data directory. Refactor BanSync.java
Refactor ManualResync.java
Merge remote-tracking branch 'upstream/master'