fixed maven build + uplaoded dependencies
Merge remote-tracking branch 'origin/trunk' into trunk