Merge pull request #1 from Arasthel/master

Sync with source
change app: to drawer:

Easier to understand what is those atributes
Merge pull request #12 from yoavst/master

Change app: to drawer:.

Makes more sense now. Thanks :)