Merge branch 'master' into database
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 'fRemovePieCeption' into development
added clean before build
fixed pom file
optimized tests and added sending to single target
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