Update the code (No special comments)..
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/wpi/cs/xchuang/dietnote/SearchScreenActivity.java
	src/edu/wpi/cs/xchuang/dietnote/db/DietDBManager.java