Renamed Database
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/src/com/fridgeboard/DataAccess.java
	src/src/com/fridgeboard/DatabaseActivity.java
Resolved changes