fix filtering by feedid
Merge branch 'master' of https://github.com/kyohiro/mining

Conflicts:
	src/main/scala/mining/io/slick/SlickFeedDAO.scala
merge and solve conflicts