Refactored to JodaTime 2.2
Merge remote-tracking branch 'origin/master' into Intern's