refactored main application (webserver)
Merge remote-tracking branch 'origin/master'

Conflicts:
	webserver/.idea/workspace.xml
refactored