Added methods to swap vectors in samples
Removed unused imports
Merge remote-tracking branch 'origin/master'
Added assembly configuration to server pom.xml