Merge branch 'master' of https://github.com/CyrilSabbagh/NoteApp.git

Conflicts:
	src/com/cyrilsabbagh/noteapp/HotCornersActivity.java