filter
Merge branch 'master' of https://github.com/rtanwar/bee_test

Conflicts:
	conf/app.conf