Merge branch 'master' into bmx6_testing

Conflicts:
	bmx6/Makefile
	olsrd/Makefile
Merge branch 'master' into bmx6_testing

Conflicts:
	bmx6/Makefile
Merge branch 'master' into bmx6_testing
bmx6/Makefile: update testing new config style
Adapt tunnels web view to new bmx6 syntax and options
bmx6: fix libjson dependency
batman-adv: fix batctl compiler problems on mips

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Merge branch 'master' into bmx6_testing
quagga: Update to v0.99.22.3
Merge branch 'master' into bmx6_testing
bmx6: update to 5fbbc59b (current master tip)
bmx6: update to d1464ee4 (current testing tip)
Merge branch 'bmx6_testing' into bmx6_testing_new_config

Conflicts:
	bmx6/Makefile
bmx6: fixing 501559 crash ?
Merge branch 'bmx6_testing_new_config' into bmx6_dev

Conflicts:
	bmx6/Makefile