mergin changes from trunk
updating to latest trunk
Added ignores for protege 4
merged all changes from origin.develop