fixing blur bug AGAIN
merging from origin
fixing merge conflict
Fixed deprecated import
Updated wagtail to 0.7 beta
Merge branch 'wagtail-0.7' into staging