update project settings
Merge branch 'master' of ssh://github.com/HTWK-App/Server-Application

Conflicts:
	pom.xml
add custom Weather Icons

Conflicts:
	pom.xml