Update bmx6. New functionallity of tunnel creation ondemand
bmx6-testing: update testing branch
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
Merge branch 'master' into bmx6_testing
Merge branch 'master' into bmx6_testing
bmx6: update to 5fbbc59b (current master tip)
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
Revert "Adapt tunnels web view to new bmx6 syntax and options"

This reverts commit b493828d75c23d2733fafd317c9d5859959d8c3f.
bmx6: fixing 501559 crash ?
if we could not get the l3 device in olsrd_write_interface then try to get the
	physical device instead. But only if the protocoll is "static" or "none".
	This is useful to write Interfaces in the resulting olsrd.conf file which
	are not up at the time olsrd is starting (e.g. tunnel interfaces):
batman-adv: 2013.3.0 updated stability fixes

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Revert "Revert "Adapt tunnels web view to new bmx6 syntax and options""

This reverts commit 6360d4c977b6b8fb6b0c80e0fcd29f43e0cc1cba.
Merge branch 'bmx6_testing_new_config' into bmx6_testing
Merge branch 'master' into bmx6_testing

Conflicts:
	bmx6/Makefile