31052014
31052014
Merge branch 'master' of https://github.com/BodeAG/BodeAG

Conflicts:
	DXWinForm_DESTAP/DXWinForm_DESTAP.v11.suo
	DXWinForm_DESTAP/DXWinForm_DESTAP/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	DXWinForm_DESTAP/DXWinForm_DESTAP/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache