Hostapd 2.1
Merge branch 'master' of github.com:kepstin/kepstin-exheres

Conflicts:
	metadata/categories.conf