Separated server and test into two individual module
added server code
Separated server and test into two individual module
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	web-app/css/main.css
reduced font size slightly