commented server-part of each component
Merge remote-tracking branch 'origin/master'