Merge branch 'master' into Develop

cps/cli.py

@@ -45,6 +45,7 @@ parser.add_argument('-v', '--version', action='version', help='Shows version num
                     version=version_info())
 parser.add_argument('-i', metavar='ip-address', help='Server IP-Address to listen')
 parser.add_argument('-s', metavar='user:pass', help='Sets specific username to new password')
+parser.add_argument('-f', action='store_true', help='Flag is depreciated and will be removed in next version')
 args = parser.parse_args()
 
 if sys.version_info < (3, 0):
@@ -113,3 +114,6 @@ user_credentials = args.s or None
 if user_credentials and ":" not in user_credentials:
     print("No valid 'username:password' format")
     sys.exit(3)
+
+if args.f:
+    print("Warning: -f flag is depreciated and will be removed in next version")

cps/static/cmaps/CNS2-V.bcmap

@@ -0,0 +1,3 @@
+<03>RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE<53>CNS2-H

cps/static/cmaps/ETenms-B5-H.bcmap

@@ -0,0 +1,3 @@
+<02>RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE<53>	ETen-B5-H`
 ^

cps/static/cmaps/GB-H.bcmap

@@ -0,0 +1,4 @@
+<02>RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE

!!<21><>]aX!!]`<60>21<32>>	<09>p<0B>z<EFBFBD>$]<5D><06>"R<>d<EFBFBD>-U<>7<EFBFBD>*<17>
+4<>%<25>+ <20>Z <20>{<7B>/<1F>%<25><<3C>9K<39>b<EFBFBD>1]<5D>.<2E>"<1F><0C>`]<5D>,<2C>"]<5D>