Updated build tools/plugin versions
Updated source to joda-time 2.6
Bumped version to 2.6.0 r10
Merge branch 'dev'