More service stuff
Merge branch 'master' of https://github.com/GeneralDoddi/RuFoos
Merge branch 'master' of https://github.com/GeneralDoddi/RuFoos
More service stuff
Merge branch 'master' of https://github.com/GeneralDoddi/RuFoos

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/GeneralDoddi/RuFoos

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/GeneralDoddi/RuFoos

Conflicts:
	.idea/workspace.xml