Merge branch 'master' into database
Merge branch 'master' into jackson
Merge branch 'startup' of https://github.com/vauvenal5/pieShare into startup
Merge branch 'fCmdService' of https://github.com/vauvenal5/pieShare into fCmdService
added configuration reader
Started testing FileMerger. Fixed some bugs. Started implementing file copy.
Merge branch 'development' into fCmdService
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
refactored parts of pieCeption; fixed bugs
fixes in file copy
changed compressor to work with byte[] instead streams
compressor fixes
work in progress
removed pieCeption for the time being
fixed config settings after piePlate delete
Merge branch 'fRemovePieCeption' into development
added clean before build