dafsdf
Merge branch 'master' of github.com:slayerrensky/api.freifunk.net

Conflicts:
	generator/ffapi.js