Added OIdentifiable.lock() and .unlock()
Merged branch "develop"
Fixed all pending errors with transaction's locks