add event
add interface
resolve conflicts
Merge branch 'master' of https://github.com/justek-Wade/SmartHome.git

Conflicts:
	SmartHome/src/com/gdgl/manager/LightManager.java
	SmartHome/src/com/gdgl/mydata/EventType.java