Updated the update and delete parameters for the NoteCard methods
Merge remote-tracking branch 'origin/master'

Conflicts:
	study/src/main/java/com/nelson/flashcards/study/NoteCard.java
Added new settings table to the db and appropriate methods to interact with the settings db.