xx
Merge branch 'master' of github.com:AxiosDevelopment/AxiosDev

Conflicts:
	Messages.aspx.vb
	bin/Axios.dll
	bin/Axios.pdb
	bin/Axios.xml
	obj/Debug/Axios.dll
	obj/Debug/Axios.pdb
	obj/Debug/Axios.xml
xx
Merge branch 'master' of github.com:AxiosDevelopment/AxiosDev

Conflicts:
	bin/Axios.dll
	bin/Axios.pdb
	bin/Axios.xml
	obj/Debug/Axios.dll
	obj/Debug/Axios.pdb
	obj/Debug/Axios.vbproj.GenerateResource.Cache
	obj/Debug/Axios.xml
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache