Added conflict resolution to pull.
Fixed an exception that was being thrown when selecting features with a vector layer up.
Bug fixes, translations
Fixed some issues with syncing.
Removed unnecessary console log.
fixed translation bug.