Merge branch 'master' into jackson
Merge branch 'startup' of https://github.com/vauvenal5/pieShare into startup
added configuration reader
Started testing FileMerger. Fixed some bugs. Started implementing file copy.
started implementing file copy services
added more fileCopy stuff, IMPORTANT for me (Richy): from now on every remote call calls the function remoteFileChanged from merger.
file copy fixes, registered tasks, switched off AllFilesSync
added getBean(String) to bean Service to fix a bug in fileChangedMessage
fixes in file copy
changed compressor to work with byte[] instead streams
compressor fixes
Merge branch 'fClusterFixing' into development
added and optimised cluster tests
added send many test to cluster tests
Merge branch 'development' of https://github.com/vauvenal5/pieShare into development
merged Development branch, fixed all changed things, fixed Beans.
Merge branch 'development' of github.com:vauvenal5/pieShare into development
added pbe encryption service
added Base64Service to compressor
merges development branch. Fixes merge bugs