New Database Code added. This code is PK's merged with Bernardo's.
Merge branch 'master' of ssh://github.com/avivkiss/WHIP_Scaffold

Conflicts:
	WineHipster/src/com/example/winehipster/EntryActivity.java

/////////////////////////////////////////////
There were 2 class headers for EntryActivity.java. I kept the one that implemented OnClickListener