First Commit (direct copy of MA)
Fixed the X2E breaking!!
Merge branch 'Socket-Branch' of https://github.com/Lewiswight/MistAway-Gateway into Socket-Branch

Conflicts:
	.DS_Store
	Dia_2.1.0/src/devices/xbee/.DS_Store
	Dia_2.1.0/src/devices/xbee/common/prodid.py
	MistAway/.DS_Store
	MistAway/.metadata/.bak_0.log
	MistAway/.metadata/.log

MistAway/.metadata/.plugins/com.digi.workbench.remoteConfiguration/.remo
teConfiguration/X2 ZB.remoteConfiguration

MistAway/.metadata/.plugins/com.python.pydev.analysis/python_v1_qvza0nrn
v87fzpcp84voei1g/python.pydevsysteminfo

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/1f/e050a
3533cdf00121136a9e21f588315

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/23/a0481
75641930012197ef179527e2cc4

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/27/e0b6d
4e81f930012197ef179527e2cc4

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/3e/c0d52
56da19c001212b8e13530c96614

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/40/00bff
1f8fd9b00121dd1c6f2877edef8

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/4c/40b6d
fe1ef9b00121dd1c6f2877edef8

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/4d/90024
71f3edf00121136a9e21f588315

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/4d/d00bb
a51c1ef00121469fdb9bc7ce929

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/6/904dc9
4b06f0001219e0a4022ee8931c

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/6/d07a55
5141930012197ef179527e2cc4

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/79/900a7
343e49a00121d8fc07b43a72a42

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/8/a00871
f91f930012197ef179527e2cc4

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/8d/702fd
93de89a00121d8fc07b43a72a42

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/91/60ed9
81f149800121d8fc07b43a72a42

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/b1/70146
ec799f400121982ee612907d1f9

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/b2/90ef6
5b315ef001214a2d1efce74a481

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/ba/f0024
947c1ef00121469fdb9bc7ce929

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/c8/0048f
5ff16ef001214a2d1efce74a481

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/c9/3034e
dbc3cdf00121136a9e21f588315

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/cf/b09f2
28b15ef001214a2d1efce74a481

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/d6/20967
60b1cef00121469fdb9bc7ce929

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/da/50a05
41685950012197ef179527e2cc4

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/dd/10be0
a43f09b00121dd1c6f2877edef8

MistAway/.metadata/.plugins/org.eclipse.core.resources/.history/dd/802a6
ba7f6ee001214a2d1efce74a481

MistAway/.metadata/.plugins/org.eclipse.core.resources/.projects/meshabl
e/.indexes/4b/99/f3/history.index

MistAway/.metadata/.plugins/org.eclipse.core.resources/.projects/meshabl
e/.indexes/af/history.index

MistAway/.metadata/.plugins/org.eclipse.core.resources/.projects/meshabl
e/.indexes/f/history.index

MistAway/.metadata/.plugins/org.eclipse.core.resources/.projects/meshabl
e/.indexes/history.index

MistAway/.metadata/.plugins/org.eclipse.core.resources/.projects/meshabl
e/.indexes/properties.index

MistAway/.metadata/.plugins/org.eclipse.core.resources/.projects/meshabl
e/.markers

MistAway/.metadata/.plugins/org.eclipse.core.resources/.projects/meshabl
e/.markers.snap

MistAway/.metadata/.plugins/org.eclipse.core.resources/.projects/meshabl
e/.syncinfo.snap

MistAway/.metadata/.plugins/org.eclipse.core.resources/.projects/meshabl
e/org.python.pydev/v1_astmanager/modulesKeys

MistAway/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.sn
ap
	MistAway/.metadata/.plugins/org.eclipse.core.resources/.root/95.tree

MistAway/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.ec
lipse.core.resources
	MistAway/.metadata/.plugins/org.eclipse.core.resources/.snap

MistAway/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.digi.
packagemanager.prefs

MistAway/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclip
se.tm.terminal.view.prefs

MistAway/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclip
se.ui.browser.prefs
	MistAway/.metadata/.plugins/org.eclipse.debug.core/.launches/meshable
(2).launch
	MistAway/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml

MistAway/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHist
ory.xml
	MistAway/.metadata/.plugins/org.eclipse.search/dialog_settings.xml

MistAway/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_s
ettings.xml
	MistAway/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	MistAway/.metadata/.plugins/org.python.pydev/dialog_settings.xml
	MistAway/.metadata/.plugins/org.python.pydev/ping.log

MistAway/.metadata/.plugins/org.python.pydev/v1_qvza0nrnv87fzpcp84voei1g
/10.v1_sys_astdelta

MistAway/.metadata/.plugins/org.python.pydev/v1_qvza0nrnv87fzpcp84voei1g
/2.v1_sys_astdelta

MistAway/.metadata/.plugins/org.python.pydev/v1_qvza0nrnv87fzpcp84voei1g
/3.v1_sys_astdelta

MistAway/.metadata/.plugins/org.python.pydev/v1_qvza0nrnv87fzpcp84voei1g
/4.v1_sys_astdelta

MistAway/.metadata/.plugins/org.python.pydev/v1_qvza0nrnv87fzpcp84voei1g
/5.v1_sys_astdelta

MistAway/.metadata/.plugins/org.python.pydev/v1_qvza0nrnv87fzpcp84voei1g
/6.v1_sys_astdelta

MistAway/.metadata/.plugins/org.python.pydev/v1_qvza0nrnv87fzpcp84voei1g
/7.v1_sys_astdelta

MistAway/.metadata/.plugins/org.python.pydev/v1_qvza0nrnv87fzpcp84voei1g
/8.v1_sys_astdelta

MistAway/.metadata/.plugins/org.python.pydev/v1_qvza0nrnv87fzpcp84voei1g
/9.v1_sys_astdelta
	MistAway/meshable/.DS_Store
	MistAway/meshable/.settings/com.digi.dpdev.build.prefs
	MistAway/meshable/HouseLynx1.yml
	MistAway/meshable/build/debug/dia.zip
	MistAway/meshable/build/debug/dpdsrv.py
	MistAway/meshable/build/release/dia.zip
	MistAway/meshable/build/release/dpdsrv.py
	MistAway/meshable/custom_devices/MistAway_Controller_updated_Dia2.py
	MistAway/meshable/custom_devices/hl_main.py
	MistAway/meshable/custom_devices/test.py

MistAway/meshable/custom_presentations/presentations/idigi_db/MistAwayUp
load2.py
I hope GIT does't F**K up my work