Han's code
Merge branch 'beta' into GBranch

Conflicts:
	Farseer/src/com/eatopian/recommendation/Dish.java
	Farseer/src/com/eatopian/recommendation/Mongodb.java
Merge pull request #9 from geniewang/GBranch

G branch
Change type of dishID from String to ObjectId