event type
Merge remote-tracking branch 'origin/master'

Conflicts:
	SmartHome/src/com/gdgl/mydata/EventType.java
Merge branch 'master' of https://github.com/justek-Wade/SmartHome.git
Merge branch 'master' of https://github.com/justek-Wade/SmartHome.git
some details