Merge pull request #2 from Arasthel/master

Sync with source
Merge pull request #3 from Arasthel/master

Sync with source
do not inflate the listview if in edit mode

Should fix the layout designer bug, I guess.
Merge pull request #15 from yoavst/master

Fix for Layout Designer