Merge with current master into namespace_generate

Conflicts:
	examples/src/xml2ns0.c
	include/ua_basictypes.h
	src/Makefile.am
	src/ua_basictypes.c
	src/ua_namespace.h
	src/ua_xml.c
	src/ua_xml.h
	tools/generate_builtin.py
	tools/generate_namespace.py