Merge pull request #1 from agudulin/master

Fixed NPE when browser requests favicon.ico
Update TemperatureFormatter.java

Fix +0 temperature
Merge pull request #2 from Litemn/master

Update TemperatureFormatter.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/webapp/index.ftl