fixed Ctrl+Shift+N to Ctrl+N for missing import
Merge branch 'master' of github.com:pocha/androidtutorial
Merge branch 'master' of github.com:pocha/androidtutorial
Sanitized Genymotion stuff