Merge branch 'development' of…

Merge branch 'development' of http://stash.vsoftconsulting.com:7990/scm/uoflma/uofl-android into development

app/src/main/java/com/vsoft/uoflservicenow/ui/CatalogueVariableScreen.java

@@ -232,7 +232,8 @@ public class CatalogueVariableScreen extends AppCompatActivity {
                             (int) getResources().getDimension(R.dimen.small_margin),
                             (int) getResources().getDimension(R.dimen.small_margin));
                     mContainerLayout.addView(nameNullView, childLabelViewLayoutParams);
-                } else {
+                } else if(viewType != ViewType.CONTAINER_START && viewType != ViewType.CONTAINER_END && viewType != ViewType.CONTAINER_SPLIT) {
+                    /*For CONTAINER_START, CONTAINER_END and CONTAINER_SPLIT, there is no need to render any view*/
                     if (viewType != ViewType.LABEL && viewType != ViewType.CHECK_BOX && viewType != ViewType.BREAK) {
                         /*Create label for every type*/
                         if (!catalogueVariable.isMandatory()) {