Merge "fix controller creation bug type field have the wrong id so caused json parse...
-rw-r--r-- 37 .gitattributes
-rw-r--r-- 63 .gitreview
drwxr-xr-x - openo-portal
-rw-r--r-- 1374 pom.xml
drwxr-xr-x - servicegateway