Removed ShortcutRecorder module
Linked to ShortcutRecorder.framework directly
Added ShortcutRecorder directly (again)
Merge branch 'master' into clean