Merge pull request #65 from Neamar/develop

v18
Merge branch 'develop'
V18
Removed ic_empty, since only visible on tablets
V19
Create shortcut
Shortcut selection
Up behavior for shortcuts
Static messup corrected