[ffulm] updated feeds
[ffulm] updated batman-adv
Merge branch 'master' into saraedum

Conflicts:
	git-feeds/batman-adv