zhou
Merge branch 'master' of https://github.com/JustDoDo/PowerManager

Conflicts:
	src/com/jdd/powermanager/model/MeterSurvey/MeterSurveyDataManager.java
zhou