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

Conflicts:
	AndroidManifest.xml
	res/layout/activity_main.xml
	res/values/strings.xml
	src/com/cyrilsabbagh/noteapp/MainActivity.java
Added databasecontrollers