Some additional constants
Rudimentary ClientServer connections implementation
Merge branch 'connection' into dev