Merge
Merget i think
Focus works no bugs
add line button edgeviewmodel
merged with master
merged with master