Error logging is added
Command subscription fix
joda-time 2.5
NPE fix
Merge remote-tracking branch 'origin/master'
Equipment registration fix
Optimistic locks fixes
Merge remote-tracking branch 'origin/master' into stable