wss add
complete spring timer
Merge remote-tracking branch 'origin/master'

Conflicts:
	MicroGridPower/.classpath
	MicroGridPower/.settings/org.eclipse.jdt.core.prefs
	MicroGridPower/.settings/org.eclipse.wst.common.component
	MicroGridPower/src/main/java/com/sieme/power/controller/WeatherController.java
	MicroGridPower/src/main/java/com/sieme/power/model/BaseModel.java
	MicroGridPower/src/main/java/com/sieme/power/service/impl/WeatherServiceImpl.java
	MicroGridPower/src/main/resources/springservlet-config.xml