some random changes
Merge branch 'master' of github.com:buhhy/eatin

Conflicts:
	eatinPlay/app/controllers/Application.java
	eatinPlay/app/models/Helper.java