diff --git a/.actionScriptProperties b/.actionScriptProperties
old mode 100644
new mode 100755
diff --git a/.flexProperties b/.flexProperties
old mode 100644
new mode 100755
diff --git a/.project b/.project
old mode 100644
new mode 100755
diff --git a/html-template/index.template.html b/html-template/index.template.html
old mode 100644
new mode 100755
diff --git a/html-template/playerProductInstall.swf b/html-template/playerProductInstall.swf
old mode 100644
new mode 100755
diff --git a/html-template/swfobject.js b/html-template/swfobject.js
old mode 100644
new mode 100755
diff --git a/libs/HowToDownloadSWC.txt b/libs/HowToDownloadSWC.txt
old mode 100644
new mode 100755
index 847f3d6..fe52445
--- a/libs/HowToDownloadSWC.txt
+++ b/libs/HowToDownloadSWC.txt
@@ -1,3 +1,3 @@
-Download the SWC (the API Library) from Beta Community - see link at http://resourcesbeta.arcgis.com/en/webapis/flex-api/community/index.html
+Download the SWC (the API Library) from http://links.esri.com/flex-api/latest-download
 
-More information on ArcGIS API for Flex: http://resourcesbeta.arcgis.com/en/webapis/flex-api/community/index.html
+More information on ArcGIS API for Flex: http://links.esri.com/flex-api
diff --git a/license.txt b/license.txt
old mode 100644
new mode 100755
diff --git a/locale/ar/ViewerStrings.properties b/locale/ar/ViewerStrings.properties
old mode 100644
new mode 100755
index 0b667ef..13c9684
--- a/locale/ar/ViewerStrings.properties
+++ b/locale/ar/ViewerStrings.properties
@@ -1,7 +1,7 @@
 # -- UI related messages for the context menu on the map, in addition to messages from the api --
 #
-contextMenuText=حول ArcGIS Viewer لـ Flex...
-aboutText=هذا التطبيق يستخدم الإصدار 3.0Prerelease من ArcGIS Viewer لـ Flex. تاريخ الإصدار 2012-03-15 .
+contextMenuText=حول ArcGIS Viewer for Flex...
+aboutText=هذا التطبيق يستخدم الإصدار 3.0 من ArcGIS Viewer for Flex. تاريخ الإصدار 2012-06-06 .
 aboutLearnMoreBtn=تعلم المزيد
 aboutCloseBtn=إغلاق
 
@@ -23,6 +23,7 @@ errorLabel=خطأ
 problemLabel=مشكلة
 noFeatures=لم يتم العثور على معالم.
 resultsLabel=النتائج
+saveLabel=حفظ
 
 # --- Units Strings --
 unitsFeet=قدم
@@ -83,7 +84,6 @@ closeToolTip=انقر لإغلاق خريطة النظرة العامة
 ########## MapSwitcher Widget
 layerListLabel=المزيد...
 basemap=خريطة الأساس
-selectBasemap=تحديد خريطة أساس
 
 ########## HeaderController Widget
 aboutLabel=حول
@@ -123,7 +123,7 @@ markerStyleSquare=مربع
 markerStyleTriangle=مثلث
 markerStyleX=X
 
-textFont1=Courier
+textFont1=Courier New
 textFont2=Arial
 textFont3=Broadway
 textFont4=Comic Sans MS
@@ -205,11 +205,12 @@ saveDataFileLabel=تم إنشاء ملف البيانات. هل ترغب في ح
 ########## Edit Widget
 attributesLabel=البيانات الجدولية
 attachmentsLabel=المرفقات
-featureLayerNotVisibleText=طبقة المعلم إما غير مرئية أو تقع خارج نطاق المدى
+featureLayerOutOfScaleText=طبقة المعلم هذه تقع خارج نطاق المدى
 showAttachmentsText=إظهار المرفقات
 showAttributesText=إظهار السمات
 selectTemplateText=اختر قالب لإنشاء معلم
 noEditableLayersText=لا توجد طبقات قابلة للتحرير.
+noCreateCapabilityLayersText=لم تقم أي من الطبقات بإنشاء الإمكانية
 layerNotSupportingAttachmentsText=هذه الطبقة لا تدعم المرفقات
 noAttachmentsText=لا توجد مرفقات
 chooseFileText=اختر ملفَا لإرفاقه
@@ -304,3 +305,4 @@ drawToolMenuLabel=تحديد أداة رسم
 selectLabel=تحديد
 noLayersLabel=لا توجد طبقات
 noChartDataToDisplayLabel=لا توجد بيانات مخطط لعرضها
+featureLayerNotVisibleText=طبقة المعلم إما غير مرئية أو تقع خارج نطاق المدى
\ No newline at end of file
diff --git a/locale/de_DE/ViewerStrings.properties b/locale/de_DE/ViewerStrings.properties
old mode 100644
new mode 100755
index 6e5b8f4..e1142c3
--- a/locale/de_DE/ViewerStrings.properties
+++ b/locale/de_DE/ViewerStrings.properties
@@ -1,7 +1,7 @@
 # -- UI related messages for the context menu on the map, in addition to messages from the api --
 #
 contextMenuText=Info zu ArcGIS Viewer for Flex...
-aboutText=Diese Anwendung verwendet ArcGIS Viewer for Flex Version 3.0Prerelease.\nBuild-Datum: 2012-03-15.
+aboutText=Diese Anwendung verwendet ArcGIS Viewer for Flex Version 3.0.\nBuild-Datum: 2012-06-06.
 aboutLearnMoreBtn=Weitere Informationen
 aboutCloseBtn=Schließen
 
@@ -23,6 +23,7 @@ errorLabel=Fehler
 problemLabel=Problem
 noFeatures=Keine Features gefunden.
 resultsLabel=Ergebnisse
+saveLabel=Speichern
 
 # --- Units Strings --
 unitsFeet=Fuß
@@ -83,7 +84,6 @@ closeToolTip=Klicken, um Übersichtskarte zu schließen
 ########## MapSwitcher Widget
 layerListLabel=Mehr...
 basemap=Grundkarte
-selectBasemap=Grundkarte auswählen
 
 ########## HeaderController Widget
 aboutLabel=Info
@@ -123,7 +123,7 @@ markerStyleSquare=Quadrat
 markerStyleTriangle=Dreieck
 markerStyleX=X
 
-textFont1=Courier
+textFont1=Courier New
 textFont2=Arial
 textFont3=Broadway
 textFont4=Comic Sans MS
@@ -205,11 +205,12 @@ saveDataFileLabel=Die Datendatei wurde erstellt. Möchten Sie sie speichern?
 ########## Edit Widget
 attributesLabel=Attribute
 attachmentsLabel=Anlagen
-featureLayerNotVisibleText=Feature-Layer ist entweder nicht sichtbar oder liegt außerhalb des Maßstabsbereichs
+featureLayerOutOfScaleText=Dieser Feature-Layer liegt außerhalb des Maßstabsbereichs
 showAttachmentsText=Anlagen anzeigen
 showAttributesText=Attribute anzeigen
 selectTemplateText=Vorlage zur Feature-Erstellung auswählen
 noEditableLayersText=Keine editierbaren Layer.
+noCreateCapabilityLayersText=Kein Layer verfügt über die Funktion "Erstellen"
 layerNotSupportingAttachmentsText=Dieser Layer unterstützt keine Anlagen
 noAttachmentsText=Keine Anlagen
 chooseFileText=Datei als Anlage wählen
@@ -304,3 +305,4 @@ drawToolMenuLabel=Zeichenwerkzeug auswählen
 selectLabel=Auswählen
 noLayersLabel=Keine Layer verfügbar
 noChartDataToDisplayLabel=Keine Diagrammdaten zur Anzeige verfügbar
+featureLayerNotVisibleText=Feature-Layer ist entweder nicht sichtbar oder liegt außerhalb des Maßstabsbereichs
\ No newline at end of file
diff --git a/locale/en_US/ViewerStrings.properties b/locale/en_US/ViewerStrings.properties
old mode 100644
new mode 100755
index ddecc39..cb3781d
--- a/locale/en_US/ViewerStrings.properties
+++ b/locale/en_US/ViewerStrings.properties
@@ -1,7 +1,7 @@
 # -- UI related messages for the context menu on the map, in addition to messages from the api --
 #
 contextMenuText=About ArcGIS Viewer for Flex...
-aboutText=This application is using ArcGIS Viewer for Flex version 3.0Prerelease.\nBuild date 2012-03-15.
+aboutText=This application is using ArcGIS Viewer for Flex version 3.0.\nBuild date 2012-06-06.
 aboutLearnMoreBtn=Learn more
 aboutCloseBtn=Close
 
@@ -23,6 +23,7 @@ errorLabel=Error
 problemLabel=Problem
 noFeatures=No features found.
 resultsLabel=Results
+saveLabel=Save
 
 # --- Units Strings --
 unitsFeet=Feet
@@ -83,7 +84,6 @@ closeToolTip=Click to close overview map
 ########## MapSwitcher Widget
 layerListLabel=More...
 basemap=Basemap
-selectBasemap=Select a basemap
 
 ########## HeaderController Widget
 aboutLabel=About
@@ -123,7 +123,7 @@ markerStyleSquare=Square
 markerStyleTriangle=Triangle
 markerStyleX=X
 
-textFont1=Courier
+textFont1=Courier New
 textFont2=Arial
 textFont3=Broadway
 textFont4=Comic Sans MS
@@ -205,11 +205,12 @@ saveDataFileLabel=Data file created. Would you like to save it?
 ########## Edit Widget
 attributesLabel=Attributes
 attachmentsLabel=Attachments
-featureLayerNotVisibleText=feature layer is either not visible or out of scale range
+featureLayerOutOfScaleText=This feature layer is out of scale range
 showAttachmentsText=Show Attachments
 showAttributesText=Show Attributes
 selectTemplateText=Select template to create feature
 noEditableLayersText=No editable layers.
+noCreateCapabilityLayersText=None of the layers have create capability
 layerNotSupportingAttachmentsText=This layer does not support attachments
 noAttachmentsText=No attachments
 chooseFileText=Choose a file to attach
@@ -304,3 +305,4 @@ drawToolMenuLabel=Select draw tool
 selectLabel=Select
 noLayersLabel=No layers
 noChartDataToDisplayLabel=No chart data to display
+featureLayerNotVisibleText=feature layer is either not visible or out of scale range
\ No newline at end of file
diff --git a/locale/es_ES/ViewerStrings.properties b/locale/es_ES/ViewerStrings.properties
old mode 100644
new mode 100755
index 206a2d2..3632969
--- a/locale/es_ES/ViewerStrings.properties
+++ b/locale/es_ES/ViewerStrings.properties
@@ -1,7 +1,7 @@
 # -- UI related messages for the context menu on the map, in addition to messages from the api --
 #
 contextMenuText=Acerca de ArcGIS Viewer for Flex...
-aboutText=Esta aplicación utiliza ArcGIS Viewer for Flex versión 3.0Prerelease.\nFecha de compilación 2012-03-15.
+aboutText=Esta aplicación utiliza ArcGIS Viewer for Flex versión 3.0.\nFecha de compilación 2012-06-06.
 aboutLearnMoreBtn=Más información
 aboutCloseBtn=Cerrar
 
@@ -23,6 +23,7 @@ errorLabel=Error
 problemLabel=Problema
 noFeatures=No se encontraron entidades.
 resultsLabel=Resultados
+saveLabel=Guardar
 
 # --- Units Strings --
 unitsFeet=Feet
@@ -83,7 +84,6 @@ closeToolTip=Haga clic para cerrar el mapa de vista general
 ########## MapSwitcher Widget
 layerListLabel=Más...
 basemap=Mapa base
-selectBasemap=Seleccionar un mapa base
 
 ########## HeaderController Widget
 aboutLabel=Acerca de
@@ -123,7 +123,7 @@ markerStyleSquare=Cuadrado
 markerStyleTriangle=Triángulo
 markerStyleX=X
 
-textFont1=Courier
+textFont1=Courier New
 textFont2=Arial
 textFont3=Broadway
 textFont4=Comic Sans MS
@@ -205,11 +205,12 @@ saveDataFileLabel=Se creó el archivo de datos. ¿Desea guardarlo?
 ########## Edit Widget
 attributesLabel=Atributos
 attachmentsLabel=Adjuntos
-featureLayerNotVisibleText=la capa de entidades no está visible o está fuera del rango de escala
+featureLayerOutOfScaleText=Esta capa de entidades está fuera del rango de escala
 showAttachmentsText=Mostrar adjuntos
 showAttributesText=Mostrar atributos
 selectTemplateText=Seleccione la plantilla para crear la entidad
 noEditableLayersText=Capas no editables.
+noCreateCapabilityLayersText=Ninguna de las capas tiene capacidad de crear
 layerNotSupportingAttachmentsText=Esta capa no es compatible con los archivos adjuntos
 noAttachmentsText=Sin adjuntos
 chooseFileText=Elija un archivo para adjuntar
@@ -304,3 +305,4 @@ drawToolMenuLabel=Seleccionar herramienta de dibujo
 selectLabel=Seleccionar
 noLayersLabel=No hay capas
 noChartDataToDisplayLabel=No hay datos de gráfico para mostrar
+featureLayerNotVisibleText=la capa de entidades no está visible o está fuera del rango de escala
\ No newline at end of file
diff --git a/locale/fr_FR/ViewerStrings.properties b/locale/fr_FR/ViewerStrings.properties
old mode 100644
new mode 100755
index 93df674..bd31c53
--- a/locale/fr_FR/ViewerStrings.properties
+++ b/locale/fr_FR/ViewerStrings.properties
@@ -1,7 +1,7 @@
 # -- UI related messages for the context menu on the map, in addition to messages from the api --
 #
 contextMenuText=A propos d’ArcGIS Viewer for Flex...
-aboutText=Cette application utilise ArcGIS Viewer for Flex version 3.0Prerelease.\nDate de la version 2012-03-15.
+aboutText=Cette application utilise ArcGIS Viewer for Flex version 3.0.\nDate de la version 2012-06-06.
 aboutLearnMoreBtn=En savoir plus
 aboutCloseBtn=Fermer
 
@@ -23,6 +23,7 @@ errorLabel=Erreur
 problemLabel=Problème
 noFeatures=Aucune entité n’a été trouvée.
 resultsLabel=Résultats
+saveLabel=Enregistrer
 
 # --- Units Strings --
 unitsFeet=Feet
@@ -83,7 +84,6 @@ closeToolTip=Cliquez pour fermer la carte globale
 ########## MapSwitcher Widget
 layerListLabel=Extras...
 basemap=Fond de carte
-selectBasemap=Sélectionner un fond de carte
 
 ########## HeaderController Widget
 aboutLabel=A propos de
@@ -123,7 +123,7 @@ markerStyleSquare=Carré
 markerStyleTriangle=Triangle
 markerStyleX=X
 
-textFont1=Courier
+textFont1=Courier New
 textFont2=Arial
 textFont3=Broadway
 textFont4=Comic Sans MS
@@ -205,11 +205,12 @@ saveDataFileLabel=Le fichier de données a été créé. Voulez-vous l’enregis
 ########## Edit Widget
 attributesLabel=Attributs
 attachmentsLabel=Pièces jointes
-featureLayerNotVisibleText=la couche d’entités n’est pas visible ou se trouve hors de la plage d’échelle
+featureLayerOutOfScaleText=Cette couche d’entité se trouve en dehors de la plage d’échelle
 showAttachmentsText=Afficher les pièces jointes
 showAttributesText=Afficher les attributs
 selectTemplateText=Sélectionnez le modèle pour créer l’entité
 noEditableLayersText=Aucune couche pouvant être mise à jour.
+noCreateCapabilityLayersText=Aucune des couches ne dispose de fonctions de création
 layerNotSupportingAttachmentsText=Cette couche ne prend pas en charge les pièces jointes
 noAttachmentsText=Aucune pièce jointe
 chooseFileText=Choisir un fichier à joindre
@@ -304,3 +305,4 @@ drawToolMenuLabel=Sélectionner un outil de dessin
 selectLabel=Sélectionner
 noLayersLabel=Aucune couche
 noChartDataToDisplayLabel=Aucune données de graphique à afficher
+featureLayerNotVisibleText=la couche d’entités n’est pas visible ou se trouve hors de la plage d’échelle
\ No newline at end of file
diff --git a/locale/it_IT/ViewerStrings.properties b/locale/it_IT/ViewerStrings.properties
old mode 100644
new mode 100755
index 5f5a740..9e03791
--- a/locale/it_IT/ViewerStrings.properties
+++ b/locale/it_IT/ViewerStrings.properties
@@ -1,7 +1,7 @@
 # -- UI related messages for the context menu on the map, in addition to messages from the api --
 #
 contextMenuText=Informazioni su ArcGIS Viewer for Flex...
-aboutText=Questa applicazione utilizza ArcGIS Viewer for Flex versione 3.0Prerelease.\nData build 2012-03-15.
+aboutText=Questa applicazione utilizza ArcGIS Viewer for Flex versione 3.0.\nData build 2012-06-06.
 aboutLearnMoreBtn=Ulteriori informazioni
 aboutCloseBtn=Chiudi
 
@@ -23,6 +23,7 @@ errorLabel=Errore
 problemLabel=Problema
 noFeatures=Nessuna feature trovata.
 resultsLabel=Risultati
+saveLabel=Salva
 
 # --- Units Strings --
 unitsFeet=Piedi
@@ -83,7 +84,6 @@ closeToolTip=Fare clic per chiudere la mappa d´insieme
 ########## MapSwitcher Widget
 layerListLabel=Altro...
 basemap=Mappa di base
-selectBasemap=Consente di selezionare una mappa di base
 
 ########## HeaderController Widget
 aboutLabel=Informazioni su
@@ -123,7 +123,7 @@ markerStyleSquare=Quadrato
 markerStyleTriangle=Triangolo
 markerStyleX=X
 
-textFont1=Courier
+textFont1=Courier New
 textFont2=Arial
 textFont3=Broadway
 textFont4=Comic Sans MS
@@ -205,11 +205,12 @@ saveDataFileLabel=File di dati creato. Salvarlo?
 ########## Edit Widget
 attributesLabel=Attributi
 attachmentsLabel=Allegati
-featureLayerNotVisibleText=il feature layer non è visibile o non è compreso nell´intervallo della scala
+featureLayerOutOfScaleText=Feature layer non compreso nell´intervallo della scala
 showAttachmentsText=Mostra allegati
 showAttributesText=Mostra attributi
 selectTemplateText=Selezionare il modello per creare la feature
 noEditableLayersText=Nessun layer modificabile.
+noCreateCapabilityLayersText=Nessuno dei layer supporta la funzionalità di creazione
 layerNotSupportingAttachmentsText=Questo layer non supporta gli allegati
 noAttachmentsText=Nessun allegato
 chooseFileText=Scegliere un file da allegare
@@ -304,3 +305,4 @@ drawToolMenuLabel=Seleziona strumento disegno
 selectLabel=Seleziona
 noLayersLabel=Nessun layer
 noChartDataToDisplayLabel=Non sono disponibili dati grafico da visualizzare
+featureLayerNotVisibleText=il feature layer non è visibile o non è compreso nell´intervallo della scala
\ No newline at end of file
diff --git a/locale/ja_JP/ViewerStrings.properties b/locale/ja_JP/ViewerStrings.properties
old mode 100644
new mode 100755
index 89af27d..31f96c3
--- a/locale/ja_JP/ViewerStrings.properties
+++ b/locale/ja_JP/ViewerStrings.properties
@@ -1,7 +1,7 @@
 # -- UI related messages for the context menu on the map, in addition to messages from the api --
 #
 contextMenuText=ArcGIS Viewer for Flex について...
-aboutText=このアプリケーションには ArcGIS Viewer for Flex version 3.0Prerelease が使用されています。\nビルド日付 2012-03-15
+aboutText=このアプリケーションには ArcGIS Viewer for Flex version 3.0 が使用されています。\nビルド日付 2012-06-06
 aboutLearnMoreBtn=詳細
 aboutCloseBtn=閉じる
 
@@ -23,6 +23,7 @@ errorLabel=エラー
 problemLabel=問題
 noFeatures=フィーチャは見つかりませんでした。
 resultsLabel=結果
+saveLabel=保存
 
 # --- Units Strings --
 unitsFeet=フィート
@@ -83,7 +84,6 @@ closeToolTip=クリックして概観図を閉じます
 ########## MapSwitcher Widget
 layerListLabel=その他...
 basemap=ベースマップ
-selectBasemap=ベースマップを選択
 
 ########## HeaderController Widget
 aboutLabel=このアプリケーションについて
@@ -205,11 +205,12 @@ saveDataFileLabel=データ ファイルが作成されました。保存しま
 ########## Edit Widget
 attributesLabel=属性
 attachmentsLabel=添付ファイル
-featureLayerNotVisibleText=フィーチャ レイヤは非表示か、縮尺の範囲外にあります
+featureLayerOutOfScaleText=このフィーチャ レイヤは縮尺の範囲外にあります
 showAttachmentsText=添付ファイルの表示
 showAttributesText=属性の表示
 selectTemplateText=フィーチャを作成するテンプレートの選択
 noEditableLayersText=編集可能なレイヤがありません。
+noCreateCapabilityLayersText=ケーパビリティを作成しているレイヤがありません
 layerNotSupportingAttachmentsText=このレイヤは添付ファイルをサポートしていません
 noAttachmentsText=添付ファイルはありません
 chooseFileText=添付するファイルの選択
@@ -304,3 +305,4 @@ drawToolMenuLabel=描画ツールを選択
 selectLabel=選択
 noLayersLabel=レイヤがありません
 noChartDataToDisplayLabel=表示するチャート データがありません
+featureLayerNotVisibleText=フィーチャ レイヤは非表示か、縮尺の範囲外にあります
\ No newline at end of file
diff --git a/locale/ko_KR/ViewerStrings.properties b/locale/ko_KR/ViewerStrings.properties
new file mode 100755
index 0000000..17aa998
--- /dev/null
+++ b/locale/ko_KR/ViewerStrings.properties
@@ -0,0 +1,308 @@
+# -- UI related messages for the context menu on the map, in addition to messages from the api --
+#
+contextMenuText=ArcGIS Viewer for Flex 정보...
+aboutText=이 응용프로그램은 ArcGIS Viewer for Flex 버전 3.0을(를) 사용 중입니다.\n빌드 날짜 2012-06-06.
+aboutLearnMoreBtn=자세히 보기
+aboutCloseBtn=닫기
+
+# -- Widget Template Strings --
+#
+close=닫기
+minimize=최소화
+
+# --- general locale specifics
+locateExampleValueX=126.9779
+locateExampleValueY=37.5665
+
+# -- Generic strings --
+clearLabel=지우기
+deleteLabel=삭제
+loadingLabel=로드 중...
+okLabel=확인
+errorLabel=오류
+problemLabel=문제
+noFeatures=피처가 없습니다.
+resultsLabel=결과
+saveLabel=저장
+
+# --- Units Strings --
+unitsFeet=피트
+unitsFeetAbbr=ft
+unitsKilometers=킬로미터
+unitsKilometersAbbr=km
+unitsMeters=미터
+unitsMetersAbbr=m
+unitsMiles=마일
+unitsMilesAbbr=mi
+unitsYards=야드
+unitsYardsAbbr=yd
+
+unitsAcres=에이커
+unitsAcresAbbr=ac
+unitsHectares=헥타르
+unitsHectaresAbbr=ha
+unitsSquareFeet=평방 피트
+unitsSquareFeetAbbr=sq ft
+unitsSquareKilometers=평방 킬로미터
+unitsSquareKilometersAbbr=sq km
+unitsSquareMeters=평방 미터
+unitsSquareMetersAbbr=sq m
+unitsSquareMiles=평방 마일
+unitsSquareMilesAbbr=sq mi
+unitsSquareYards=평방 야드
+unitsSquareYardsAbbr=sq yd
+
+########## TOC
+tocMapLayerZoomToLabel=확대
+tocMapLayerTransparencyLabel=투명도
+tocMapLayerOpaqueLabel=불투명
+tocMapLayerTransparentLabel=투명
+tocMapLayerMoveUpLabel=위로 이동
+tocMapLayerMoveDownLabel=아래로 이동
+tocMapLayerRemoveLabel=제거
+tocMapLayerDescriptionLabel=설명
+tocMapLayerDownloadLabel=다운로드
+
+########## MapManager
+incorrectLayerTypeText={0}은(는) 지원되는 레이어 유형이 아닙니다. 대신 "arcims", "bing", "dynamic", "feature", "image", "kml", "osm", "tiled" 또는 "wms"를 사용하세요.
+
+########## Base Widget and ConfigManager
+missingConfigFileText={0}을(를) 찾을 수 없습니다.
+parseConfigErrorText=구성 파일 {0}을(를) 구문 분석하는 동안 문제가 발생했습니다.
+httpResponseStatus=http 응답 상태: {0}
+faultCode=오류 코드: {0}
+faultInfo=오류 정보: {0}
+faultDetail=오류 설명: {0}
+
+########## Base Widget and MapManager
+configFileCrossDomain=가능한 교차 도메인 문제: {0}{1}
+
+########## Overview Map "Widget"
+openToolTip=개요 맵을 열려면 클릭
+closeToolTip=개요 맵을 닫으려면 클릭
+
+########## MapSwitcher Widget
+layerListLabel=추가...
+basemap=베이스맵
+
+########## HeaderController Widget
+aboutLabel=정보
+
+########## Navigation Widget
+fullExtentLabel=전체 범위
+panDownLabel=아래로 이동
+panLeftLabel=왼쪽으로 이동
+panRightLabel=오른쪽으로 이동
+panUpLabel=위로 이동
+previousExtentLabel=이전 범위
+nextExtentLabel=다음 범위
+panLabel=이동
+zoomInLabel=확대
+zoomOutLabel=축소
+
+# -- Common draw strings --
+
+
+# -- Draw Strings --
+#
+addTextLabel=텍스트 추가
+drawPointLabel=포인트 그리기
+drawLineLabel=라인 그리기
+drawFreehandLineLabel=자유 곡선 그리기
+drawPolygonLabel=폴리곤 그리기
+drawFreehandPolygonLabel=자유 폴리곤 그리기
+drawRectangleLabel=사각형 그리기
+drawCircleLabel=원 그리기
+drawEllipseLabel=타원 그리기
+drawClearLabel=그림 지우기
+
+markerStyleCircle=원
+markerStyleCross=십자형
+markerStyleDiamond=다이아몬드
+markerStyleSquare=사각형
+markerStyleTriangle=삼각형
+markerStyleX=X
+
+textFont1=Courier New
+textFont2=Arial
+textFont3=Broadway
+textFont4=Comic Sans MS
+textFont5=Algerian
+textFont6=Verdana
+
+lineStyleSolid=단선
+lineStyleDash=파선
+lineStyleDot=점선
+lineStyleDashDot=일점 쇄선
+lineStyleDashDotDot=이점 쇄선
+
+fillStyleSolid=단선
+fillStyleBackwardDiagonal=역방향 대각선
+fillStyleCross=십자형
+fillStyleForwardDiagonal=정방향 대각선
+fillStyleHorizontal=수평
+fillStyleVertical=수직
+
+# -- Symbol Strings --
+#
+markerAlphaLabel=알파
+markerColorLabel=표식 색상
+markerSizeLabel=크기
+markerStyleLabel=스타일
+markerOutlineColorLabel=윤곽선 색상
+markerOutlineWidthLabel=너비
+textLabel=텍스트
+textColorLabel=색상
+textFontLabel=글꼴
+textSizeLabel=크기
+textBoldLabel=B
+textBoldTooltip=굵게
+textItalicLabel=I
+textItalicTooltip=기울임꼴
+textUnderlineLabel=U
+textUnderlineTooltip=밑줄
+lineAlphaLabel=알파
+lineColorLabel=선 색
+lineStyleLabel=스타일
+lineWidthLabel=너비
+fillAlphaLabel=알파
+fillColorLabel=채우기 색
+fillStyleLabel=스타일
+fillOutlineColorLabel=윤곽선 색상
+fillOutlineWidthLabel=너비
+
+#
+# -- Measurement Strings --
+#
+showMeasurementsLabel=단위 표시
+distanceUnitsLabel=거리 단위
+areaUnitsLabel=면적 단위
+areaLabel=영역:
+perimeterLabel=둘레:
+lengthLabel=길이:
+
+########## Bookmark Widget
+bookmarksLabel=책갈피
+addbookmarksLabel=책갈피 추가
+addLabel=현재 범위를 지정된 책갈피로 추가
+bookmarkSubmitLabel=책갈피 추가
+bookmarkMissingNameLabel=책갈피 이름을 입력하세요.
+
+########## Data Extract Widget
+descLabel=데이터 추출 및 zip 파일 다운로드
+step1Label=1. 영역 선택
+dataCurrentExtentLabel=현재 범위에서 데이터가 추출됩니다.
+step2Label=2. 추출할 레이어 선택
+step3Label=3. 파일 형식 선택
+step4Label=4. 래스터 형식 선택
+step5Label=5. 공간 참조
+extractButtonLabel=추출
+step1ErrorLabel=원하는 영역을 선택하세요.
+step2ErrorLabel=추출할 레이어를 선택하세요.
+emptyResultsLabel=작업이 완료되었으나 결과를 반환하지 않았습니다.
+saveDataFileLabel=데이터 파일이 생성되었습니다. 저장하시겠습니까?
+
+########## Edit Widget
+attributesLabel=속성
+attachmentsLabel=첨부
+featureLayerOutOfScaleText=이 피처 레이어는 배율 범위를 벗어났습니다.
+showAttachmentsText=첨부 파일 표시
+showAttributesText=속성 표시
+selectTemplateText=피처를 생성할 템플릿 선택
+noEditableLayersText=편집 가능한 레이어가 없습니다.
+noCreateCapabilityLayersText=레이어에 생성 기능 없음
+layerNotSupportingAttachmentsText=이 레이어는 첨부 파일을 지원하지 않습니다.
+noAttachmentsText=첨부 파일 없음
+chooseFileText=첨부할 파일 선택
+attachmentSubmitLabel=보고
+attachmentCancelLabel=취소
+singleAttachmentText=피처에 {0} 첨부 파일이 있습니다.
+multipleAttachmentsText=피처에 {0} 첨부 파일이 있습니다.
+
+########## LayerList Widget
+layerListTitle=레이어 표시 여부
+
+########## Locate Widget
+locateSubmitLabel=항목보기
+addressLabel=주소
+coordinatesLabel=좌표
+addressTitle=주소 입력
+coordinatesTitle=좌표 입력
+xLabel=경도(X)
+yLabel=위도(Y)
+locationsLabel=찾은 위치:
+bingCulture=ko-KR
+requiredFields=필수 필드:
+requiredField=필수 필드:
+deleteResultTooltip=결과 삭제
+resultScoreText=점수:
+bingResultConfidenceText=신뢰도:
+
+########## Print Widget
+printSubmitLabel=인쇄
+printTitle=
+printSubtitle=
+printCopyright=
+printTitleLabel=제목
+printSubtitleLabel=부제목
+printCopyrightLabel=저작권
+printAuthorLabel=작성자
+printLayoutTemplatesLabel=레이아웃 템플릿
+printFormatsLabel=형식
+printScaleLabel=이 배율 사용
+
+########## Query Widget
+filterTitleBarTooltip=필터 결과
+showallTitleBarTooltip=모두 표시
+filterButtonLabel=필터
+clearButtonLabel=모두 표시
+featuresFoundLabel=찾은 피처: {0}
+
+########## Routing Widget
+drivingDirectionLabel=운전 방향
+routeSubmitLabel=방향 가져오기
+moveUpTooltip=위로 이동
+moveDownTooltip=아래로 이동
+addLocationTooltip=맵을 클릭하여 위치 추가
+optionsLabel=옵션
+bestSequenceLabel=최적의 시퀀스 찾기
+milesLabel=마일
+metricLabel=Km
+changeRouteSymbolLabel=경로 심볼 변경
+editRouteLabel=경로 편집
+
+########## Search Widget
+graphicalTitleBarTooltip=피처 선택
+textTitleBarTooltip=속성으로 선택
+graphicalsearchLabel=피처 선택 기준
+textsearchLabel=속성으로 선택
+layerLabel=레이어 검색
+nolayerLabel=정의된 검색 레이어가 없습니다.
+searchSubmitLabel=검색
+selectionLabel=피처 선택됨:
+
+########## Coordinate Widget
+latitudeLabel=위도
+longitudeLabel=경도
+
+########## GP widget
+gpSubmitLabel=보고
+inputLabel=입력
+helpLabel=도움말
+outputLabel=출력
+copyToClipboard=클립보드로 복사
+unsupportedInputType={0} 입력은 지원되지 않습니다.
+
+########## Popups
+zoomLabel=확대
+
+########## Hello Widget
+helloContent=구성 파일에서 이 텍스트를 변경합니다.
+
+########## Chart Widget
+layerSelectionLabel=레이어 선택
+drawToolMenuLabel=그리기 도구 선택
+selectLabel=선택
+noLayersLabel=레이어 없음
+noChartDataToDisplayLabel=디스플레이할 차트 데이터 없음
+featureLayerNotVisibleText=피처 레이어가 표시되지 않거나 배율 범위를 벗어났습니다.
\ No newline at end of file
diff --git a/locale/nb_NO/ViewerStrings.properties b/locale/nb_NO/ViewerStrings.properties
new file mode 100755
index 0000000..dcbad46
--- /dev/null
+++ b/locale/nb_NO/ViewerStrings.properties
@@ -0,0 +1,308 @@
+# -- UI related messages for the context menu on the map, in addition to messages from the api --
+#
+contextMenuText=Om ArcGIS Viewer for Flex...
+aboutText=Dette programmet bruker ArcGIS Viewer for Flex versjon 3.0.\nByggdato 2012-06-06.
+aboutLearnMoreBtn=Lær mer
+aboutCloseBtn=Lukk
+
+# -- Widget Template Strings --
+#
+close=Lukk
+minimize=Minimer
+
+# --- general locale specifics
+locateExampleValueX=10.7276
+locateExampleValueY=59.9169
+
+# -- Generic strings --
+clearLabel=Fjern
+deleteLabel=Slett
+loadingLabel=Laster inn...
+okLabel=OK
+errorLabel=Feil
+problemLabel=Problem
+noFeatures=Fant ingen geoobjekter.
+resultsLabel=Resultater
+saveLabel=Lagre
+
+# --- Units Strings --
+unitsFeet=Fot
+unitsFeetAbbr=ft
+unitsKilometers=Kilometer
+unitsKilometersAbbr=km
+unitsMeters=Meter
+unitsMetersAbbr=m
+unitsMiles=Miles
+unitsMilesAbbr=mi
+unitsYards=Yard
+unitsYardsAbbr=yd
+
+unitsAcres=Acres
+unitsAcresAbbr=ac
+unitsHectares=Hektar
+unitsHectaresAbbr=ha
+unitsSquareFeet=Kvadratfot
+unitsSquareFeetAbbr=ft²
+unitsSquareKilometers=Kvadratkilometer
+unitsSquareKilometersAbbr=km²
+unitsSquareMeters=Kvadratmeter
+unitsSquareMetersAbbr=m²
+unitsSquareMiles=Kvadratmiles
+unitsSquareMilesAbbr=mi²
+unitsSquareYards=Kvadratyard
+unitsSquareYardsAbbr=yd²
+
+########## TOC
+tocMapLayerZoomToLabel=Zoom til
+tocMapLayerTransparencyLabel=Gjennomsiktighet
+tocMapLayerOpaqueLabel=Ugjennomsiktig
+tocMapLayerTransparentLabel=Gjennomsiktig
+tocMapLayerMoveUpLabel=Flytt opp
+tocMapLayerMoveDownLabel=Flytt ned
+tocMapLayerRemoveLabel=Fjern
+tocMapLayerDescriptionLabel=Beskrivelse
+tocMapLayerDownloadLabel=Last ned
+
+########## MapManager
+incorrectLayerTypeText={0} er ikke en støttet kartlagtype. Bruk i stedet "arcims", "bing", "dynamic", "feature", "image", "kml", "osm", "tiled" eller "wms".
+
+########## Base Widget and ConfigManager
+missingConfigFileText=Fant ikke {0}
+parseConfigErrorText=Det oppstod et problem under lesing av konfigurasjonsfilen {0}
+httpResponseStatus=http-responsstatus: {0}
+faultCode=Feilkode: {0}
+faultInfo=Feilinfo: {0}
+faultDetail=Feildetaljer: {0}
+
+########## Base Widget and MapManager
+configFileCrossDomain=Mulig kryssdomeneproblem: {0}{1}
+
+########## Overview Map "Widget"
+openToolTip=Klikk for å åpne oversiktskart
+closeToolTip=Klikk for å lukke oversiktskart
+
+########## MapSwitcher Widget
+layerListLabel=Mer...
+basemap=Bakgrunnskart
+
+########## HeaderController Widget
+aboutLabel=Om
+
+########## Navigation Widget
+fullExtentLabel=Full utstrekning
+panDownLabel=Panorer ned
+panLeftLabel=Panorer mot venstre
+panRightLabel=Panorer mot høyre
+panUpLabel=Panorer opp
+previousExtentLabel=Forrige utstrekning
+nextExtentLabel=Neste utstrekning
+panLabel=Panorer
+zoomInLabel=Zoom inn
+zoomOutLabel=Zoom ut
+
+# -- Common draw strings --
+
+
+# -- Draw Strings --
+#
+addTextLabel=Legg til tekst
+drawPointLabel=Tegn punkt
+drawLineLabel=Tegn linje
+drawFreehandLineLabel=Tegn frihåndslinje
+drawPolygonLabel=Tegn polygon
+drawFreehandPolygonLabel=Tegn frihåndspolygon
+drawRectangleLabel=Tegn rektangel
+drawCircleLabel=Tegn sirkel
+drawEllipseLabel=Tegn ellipse
+drawClearLabel=Fjern tegninger
+
+markerStyleCircle=Sirkel
+markerStyleCross=Kryss
+markerStyleDiamond=Rombe
+markerStyleSquare=Kvadrat
+markerStyleTriangle=Trekant
+markerStyleX=X
+
+textFont1=Courier New
+textFont2=Arial
+textFont3=Broadway
+textFont4=Comic Sans MS
+textFont5=Algerisk
+textFont6=Verdana
+
+lineStyleSolid=Heltrukket
+lineStyleDash=Strek
+lineStyleDot=Prikk
+lineStyleDashDot=Strek prikk
+lineStyleDashDotDot=Strek prikk prikk
+
+fillStyleSolid=Heltrukket
+fillStyleBackwardDiagonal=Bakover diagonalt
+fillStyleCross=Kryss
+fillStyleForwardDiagonal=Fremover diagonalt
+fillStyleHorizontal=Vannrett
+fillStyleVertical=Loddrett
+
+# -- Symbol Strings --
+#
+markerAlphaLabel=Alfa
+markerColorLabel=Markørfarge
+markerSizeLabel=Størrelse
+markerStyleLabel=Stil
+markerOutlineColorLabel=Omrissfarge
+markerOutlineWidthLabel=Bredde
+textLabel=Tekst
+textColorLabel=Farge
+textFontLabel=Skrift
+textSizeLabel=Størrelse
+textBoldLabel=F
+textBoldTooltip=Fet
+textItalicLabel=K
+textItalicTooltip=Kursiv
+textUnderlineLabel=U
+textUnderlineTooltip=Understreking
+lineAlphaLabel=Alfa
+lineColorLabel=Linjefarge
+lineStyleLabel=Stil
+lineWidthLabel=Bredde
+fillAlphaLabel=Alfa
+fillColorLabel=Fyllfarge
+fillStyleLabel=Stil
+fillOutlineColorLabel=Omrissfarge
+fillOutlineWidthLabel=Bredde
+
+#
+# -- Measurement Strings --
+#
+showMeasurementsLabel=Vis målinger
+distanceUnitsLabel=Avstandsenheter
+areaUnitsLabel=Arealenheter
+areaLabel=Areal:
+perimeterLabel=Omkrets:
+lengthLabel=Lengde:
+
+########## Bookmark Widget
+bookmarksLabel=Bokmerker
+addbookmarksLabel=Legg til bokmerke
+addLabel=Legg til gjeldende utstrekning som et bokmerke med navnet
+bookmarkSubmitLabel=Legg til bokmerke
+bookmarkMissingNameLabel=Skriv inn et navn for bokmerket.
+
+########## Data Extract Widget
+descLabel=Trekk ut data og last ned zip-fil
+step1Label=1. Velg område
+dataCurrentExtentLabel=Data vil bli trukket ut fra din gjeldende utstrekning.
+step2Label=2. Velg kartlag som skal trekkes ut
+step3Label=3. Velg filformat
+step4Label=4. Velg rasterformat
+step5Label=5. Koordinatsystem
+extractButtonLabel=Trekk ut
+step1ErrorLabel=Velg et område av interesse.
+step2ErrorLabel=Velg lag som skal trekkes ut.
+emptyResultsLabel=Oppgave fullført, men den returnerte ingen resultater.
+saveDataFileLabel=Datafil opprettet. Vil du lagre den?
+
+########## Edit Widget
+attributesLabel=Attributter
+attachmentsLabel=Vedlegg
+featureLayerOutOfScaleText=Dette geoobjektlaget er utenfor målestokken
+showAttachmentsText=Vis vedlegg
+showAttributesText=Vis attributter
+selectTemplateText=Velg mal for å opprette geoobjekt
+noEditableLayersText=Ingen redigerbare kartlag.
+noCreateCapabilityLayersText=Ingen av kartlagene har mulighet for å opprette
+layerNotSupportingAttachmentsText=Dette kartlaget støtter ikke vedlegg
+noAttachmentsText=Ingen vedlegg
+chooseFileText=Velg en fil som skal legges ved
+attachmentSubmitLabel=Send
+attachmentCancelLabel=Avbryt
+singleAttachmentText=Geoobjektet har {0} vedlegg
+multipleAttachmentsText=Geoobjektet har {0} vedlegg
+
+########## LayerList Widget
+layerListTitle=Kartlagsynlighet
+
+########## Locate Widget
+locateSubmitLabel=Finn
+addressLabel=Adresse
+coordinatesLabel=Koordinater
+addressTitle=Skriv inn adressen
+coordinatesTitle=Skriv inn koordinatene
+xLabel=Lengdegrad (X)
+yLabel=Breddegrad (Y)
+locationsLabel=Steder funnet:
+bingCulture=en-US
+requiredFields=Obligatoriske felter:
+requiredField=Obligatorisk felt:
+deleteResultTooltip=Slett resultat
+resultScoreText=Poengsum:
+bingResultConfidenceText=Sikkerhet:
+
+########## Print Widget
+printSubmitLabel=Skriv ut
+printTitle=
+printSubtitle=
+printCopyright=
+printTitleLabel=Tittel
+printSubtitleLabel=Undertittel
+printCopyrightLabel=Opphavsrett
+printAuthorLabel=Forfatter
+printLayoutTemplatesLabel=Oppsettmaler
+printFormatsLabel=Formater
+printScaleLabel=Bruk denne målestokken
+
+########## Query Widget
+filterTitleBarTooltip=Filtrer resultater
+showallTitleBarTooltip=Vis alle
+filterButtonLabel=Filtrer
+clearButtonLabel=Vis alle
+featuresFoundLabel=Geoobjekter funnet: {0}
+
+########## Routing Widget
+drivingDirectionLabel=Ruteangivelser
+routeSubmitLabel=Få anvisninger
+moveUpTooltip=Flytt opp
+moveDownTooltip=Flytt ned
+addLocationTooltip=klikk på kart for å legge til sted
+optionsLabel=Alternativer
+bestSequenceLabel=Finn beste sekvens
+milesLabel=Miles
+metricLabel=km
+changeRouteSymbolLabel=Endre rutesymbol
+editRouteLabel=Rediger rute
+
+########## Search Widget
+graphicalTitleBarTooltip=Velg geoobjekter
+textTitleBarTooltip=Velg etter attributt
+graphicalsearchLabel=Velg geoobjekter etter
+textsearchLabel=Velg etter attributt
+layerLabel=Søkekartlag
+nolayerLabel=Ingen søkekartlag definert.
+searchSubmitLabel=Søk
+selectionLabel=Valgte geoobjekter:
+
+########## Coordinate Widget
+latitudeLabel=Breddegrad
+longitudeLabel=Lengdegrad
+
+########## GP widget
+gpSubmitLabel=Send
+inputLabel=Inndata
+helpLabel=Hjelp
+outputLabel=Resultat
+copyToClipboard=Kopier til utklippstavle
+unsupportedInputType={0} inndata støttes ikke
+
+########## Popups
+zoomLabel=Zoom til
+
+########## Hello Widget
+helloContent=Endre denne teksten i konfigurasjonsfil.
+
+########## Chart Widget
+layerSelectionLabel=Velg lag
+drawToolMenuLabel=Velg tegneverktøy
+selectLabel=Velg
+noLayersLabel=Ingen lag
+noChartDataToDisplayLabel=Ingen diagramdata å vise
+featureLayerNotVisibleText=geoobjektlaget er enten ikke synlig eller utenfor målestokkområdet
\ No newline at end of file
diff --git a/locale/nl_NL/ViewerStrings.properties b/locale/nl_NL/ViewerStrings.properties
new file mode 100755
index 0000000..1b78981
--- /dev/null
+++ b/locale/nl_NL/ViewerStrings.properties
@@ -0,0 +1,308 @@
+# -- UI related messages for the context menu on the map, in addition to messages from the api --
+#
+contextMenuText=Informatie over ArcGIS Viewer for Flex...
+aboutText=Deze applicatie maakt gebruik van ArcGIS Viewer for Flex-versie 3.0.\nVersiedatum 2012-06-06.
+aboutLearnMoreBtn=Meer informatie
+aboutCloseBtn=Sluiten
+
+# -- Widget Template Strings --
+#
+close=Sluiten
+minimize=Minimaliseren
+
+# --- general locale specifics
+locateExampleValueX=4.884
+locateExampleValueY=52.3753
+
+# -- Generic strings --
+clearLabel=Wissen
+deleteLabel=Verwijderen
+loadingLabel=Bezig met laden...
+okLabel=OK
+errorLabel=Fout
+problemLabel=Probleem
+noFeatures=Geen objecten gevonden.
+resultsLabel=Resultaten
+saveLabel=Opslaan
+
+# --- Units Strings --
+unitsFeet=Voet
+unitsFeetAbbr=ft
+unitsKilometers=Kilometer
+unitsKilometersAbbr=km
+unitsMeters=Meter
+unitsMetersAbbr=m
+unitsMiles=Mijl
+unitsMilesAbbr=mi
+unitsYards=Yard
+unitsYardsAbbr=yd
+
+unitsAcres=Acre
+unitsAcresAbbr=ac
+unitsHectares=Hectare
+unitsHectaresAbbr=ha
+unitsSquareFeet=Vierkante voet
+unitsSquareFeetAbbr=sq ft
+unitsSquareKilometers=Vierkante kilometer
+unitsSquareKilometersAbbr=sq km
+unitsSquareMeters=Vierkante meter
+unitsSquareMetersAbbr=sq m
+unitsSquareMiles=Vierkante mijl
+unitsSquareMilesAbbr=sq mi
+unitsSquareYards=Vierkante yard
+unitsSquareYardsAbbr=sq yd
+
+########## TOC
+tocMapLayerZoomToLabel=Zoomen naar
+tocMapLayerTransparencyLabel=Transparant
+tocMapLayerOpaqueLabel=Niet transparant
+tocMapLayerTransparentLabel=Transparant
+tocMapLayerMoveUpLabel=Naar boven verplaatsen
+tocMapLayerMoveDownLabel=Naar beneden verplaatsen
+tocMapLayerRemoveLabel=Verwijderen
+tocMapLayerDescriptionLabel=Beschrijving
+tocMapLayerDownloadLabel=Downloaden
+
+########## MapManager
+incorrectLayerTypeText={0} is geen ondersteund laagtype. Gebruik "arcims", "bing", "dynamic", "feature", "image", "kml", "osm", "tiled" of "wms" in de plaats.
+
+########## Base Widget and ConfigManager
+missingConfigFileText=Kan {0} niet vinden
+parseConfigErrorText=Er is een probleem opgetreden tijdens het parseren van het configuratiebestand {0}
+httpResponseStatus=HTTP-antwoordstatus: {0}
+faultCode=Probleemcode: {0}
+faultInfo=Probleeminformatie: {0}
+faultDetail=Probleemgegevens: {0}
+
+########## Base Widget and MapManager
+configFileCrossDomain=Mogelijk probleem tussen domeinen: {0}{1}
+
+########## Overview Map "Widget"
+openToolTip=Klikken om overzichtskaart te openen
+closeToolTip=Klikken om overzichtskaart te sluiten
+
+########## MapSwitcher Widget
+layerListLabel=Meer...
+basemap=Basiskaart
+
+########## HeaderController Widget
+aboutLabel=Informatie
+
+########## Navigation Widget
+fullExtentLabel=Volledig bereik
+panDownLabel=Omlaag pannen
+panLeftLabel=Naar links pannen
+panRightLabel=Naar rechts pannen
+panUpLabel=Omhoog pannen
+previousExtentLabel=Vorige extent
+nextExtentLabel=Volgende extent
+panLabel=Pannen
+zoomInLabel=Inzoomen
+zoomOutLabel=Uitzoomen
+
+# -- Common draw strings --
+
+
+# -- Draw Strings --
+#
+addTextLabel=Tekst toevoegen
+drawPointLabel=Punt tekenen
+drawLineLabel=Lijn tekenen
+drawFreehandLineLabel=Lijn in vrije stijl tekenen
+drawPolygonLabel=Veelhoek tekenen
+drawFreehandPolygonLabel=Veelhoek in vrije stijl tekenen
+drawRectangleLabel=Rechthoek tekenen
+drawCircleLabel=Cirkel tekenen
+drawEllipseLabel=Ellips tekenen
+drawClearLabel=Tekeningen wissen
+
+markerStyleCircle=Cirkel
+markerStyleCross=Kruis
+markerStyleDiamond=Ruit
+markerStyleSquare=Vierkant
+markerStyleTriangle=Driehoek
+markerStyleX=X
+
+textFont1=Courier New
+textFont2=Arial
+textFont3=Broadway
+textFont4=Comic Sans MS
+textFont5=Algerian
+textFont6=Verdana
+
+lineStyleSolid=Effen
+lineStyleDash=Streepje
+lineStyleDot=Stip
+lineStyleDashDot=Streepje-stip
+lineStyleDashDotDot=Streepje-stip-stip
+
+fillStyleSolid=Effen
+fillStyleBackwardDiagonal=Diagonaal achterwaarts
+fillStyleCross=Kruis
+fillStyleForwardDiagonal=Diagonaal voorwaarts
+fillStyleHorizontal=Horizontaal
+fillStyleVertical=Verticaal
+
+# -- Symbol Strings --
+#
+markerAlphaLabel=Alfa
+markerColorLabel=Kleur van markering
+markerSizeLabel=Grootte
+markerStyleLabel=Stijl
+markerOutlineColorLabel=Kleur omtreklijn
+markerOutlineWidthLabel=Breedte
+textLabel=Tekst
+textColorLabel=Kleur
+textFontLabel=Lettertype
+textSizeLabel=Grootte
+textBoldLabel=B
+textBoldTooltip=Vet
+textItalicLabel=I
+textItalicTooltip=Cursief
+textUnderlineLabel=U
+textUnderlineTooltip=Onderstrepen
+lineAlphaLabel=Alfa
+lineColorLabel=Kleur van lijn
+lineStyleLabel=Stijl
+lineWidthLabel=Breedte
+fillAlphaLabel=Alfa
+fillColorLabel=Opvulkleur
+fillStyleLabel=Stijl
+fillOutlineColorLabel=Kleur omtreklijn
+fillOutlineWidthLabel=Breedte
+
+#
+# -- Measurement Strings --
+#
+showMeasurementsLabel=Meeteenheden tonen
+distanceUnitsLabel=Afstandseenheden
+areaUnitsLabel=Gebiedseenheden
+areaLabel=Gebied:
+perimeterLabel=Perimeter:
+lengthLabel=Lengte:
+
+########## Bookmark Widget
+bookmarksLabel=Bladwijzers
+addbookmarksLabel=Bladwijzer toevoegen
+addLabel=Huidige extent toevoegen als een bladwijzer genaamd
+bookmarkSubmitLabel=Bladwijzer toevoegen
+bookmarkMissingNameLabel=Voer een naam in voor de bladwijzer.
+
+########## Data Extract Widget
+descLabel=Gegevens ophalen en ZIP-bestand downloaden
+step1Label=1. Gebied selecteren
+dataCurrentExtentLabel=De gegevens worden opgehaald uit uw huidige extent.
+step2Label=2. Lagen selecteren om op te halen
+step3Label=3. Bestandsindeling selecteren
+step4Label=4. Rasterformaat selecteren
+step5Label=5. SpatialReference
+extractButtonLabel=Ophalen
+step1ErrorLabel=Selecteer een interessegebied.
+step2ErrorLabel=Selecteer lagen om op te halen.
+emptyResultsLabel=De taak is voltooid, maar er zijn geen resultaten.
+saveDataFileLabel=Het gegevensbestand is gemaakt. Wilt u het opslaan?
+
+########## Edit Widget
+attributesLabel=Attributen
+attachmentsLabel=Bijlagen
+featureLayerOutOfScaleText=Deze objectlaag valt buiten het schaalbereik
+showAttachmentsText=Bijlagen tonen
+showAttributesText=Attributen tonen
+selectTemplateText=Sjabloon voor het maken van een object selecteren
+noEditableLayersText=Geen bewerkbare lagen.
+noCreateCapabilityLayersText=Geen van de kaartlagen hebben de mogelijkheid tot maken
+layerNotSupportingAttachmentsText=Deze laag ondersteunt geen bijlagen
+noAttachmentsText=Geen bijlagen
+chooseFileText=Een bestand selecteren om bij te voegen
+attachmentSubmitLabel=Verzenden
+attachmentCancelLabel=Annuleren
+singleAttachmentText=Het object heeft {0} bijlage
+multipleAttachmentsText=Het object heeft {0} bijlagen
+
+########## LayerList Widget
+layerListTitle=Lagenzichtbaarheid
+
+########## Locate Widget
+locateSubmitLabel=Zoom naar
+addressLabel=Adres
+coordinatesLabel=Coördinaten
+addressTitle=Het adres invoeren
+coordinatesTitle=De coördinaten invoeren
+xLabel=Lengtegraad (X)
+yLabel=Breedtegraad (Y)
+locationsLabel=Gevonden locaties:
+bingCulture=nl-NL
+requiredFields=Vereiste velden:
+requiredField=Vereist veld:
+deleteResultTooltip=Resultaat verwijderen
+resultScoreText=Score:
+bingResultConfidenceText=Betrouwbaarheid:
+
+########## Print Widget
+printSubmitLabel=Afdrukken
+printTitle=
+printSubtitle=
+printCopyright=
+printTitleLabel=Titel
+printSubtitleLabel=Ondertitel
+printCopyrightLabel=Auteursrecht
+printAuthorLabel=Auteur
+printLayoutTemplatesLabel=Lay-outsjablonen
+printFormatsLabel=Indelingen
+printScaleLabel=Deze schaal gebruiken
+
+########## Query Widget
+filterTitleBarTooltip=Resultaten filteren
+showallTitleBarTooltip=Alle tonen
+filterButtonLabel=Filter
+clearButtonLabel=Alle tonen
+featuresFoundLabel=Gevonden objecten: {0}
+
+########## Routing Widget
+drivingDirectionLabel=Routebeschrijving
+routeSubmitLabel=Routebeschrijving vragen
+moveUpTooltip=Naar boven verplaatsen
+moveDownTooltip=Naar beneden verplaatsen
+addLocationTooltip=op map klikken om locatie toe te voegen
+optionsLabel=Opties
+bestSequenceLabel=Beste reeks zoeken
+milesLabel=Mijl
+metricLabel=Km
+changeRouteSymbolLabel=Routesymbool wijzigen
+editRouteLabel=Route bewerken
+
+########## Search Widget
+graphicalTitleBarTooltip=Objecten selecteren
+textTitleBarTooltip=Selecteren op attribuut
+graphicalsearchLabel=Objecten selecteren op
+textsearchLabel=Selecteren op attribuut
+layerLabel=Zoeklaag
+nolayerLabel=Geen zoeklaag opgegeven.
+searchSubmitLabel=Zoeken
+selectionLabel=Geselecteerde objecten:
+
+########## Coordinate Widget
+latitudeLabel=Breedtegraad
+longitudeLabel=Lengtegraad
+
+########## GP widget
+gpSubmitLabel=Verzenden
+inputLabel=Invoer
+helpLabel=Help
+outputLabel=Uitvoer
+copyToClipboard=Kopiëren naar Klembord
+unsupportedInputType=Niet-ondersteunde invoer: {0}
+
+########## Popups
+zoomLabel=Zoomen naar
+
+########## Hello Widget
+helloContent=Wijzig deze tekst in het configuratiebestand.
+
+########## Chart Widget
+layerSelectionLabel=Laag selecteren
+drawToolMenuLabel=Tekenhulpmiddel selecteren
+selectLabel=Selecteren
+noLayersLabel=Geen lagen
+noChartDataToDisplayLabel=Geen grafiekgegevens weer te geven
+featureLayerNotVisibleText=objectlaag is ofwel niet zichtbaar of buiten het schaalbereik
\ No newline at end of file
diff --git a/locale/pl_PL/ViewerStrings.properties b/locale/pl_PL/ViewerStrings.properties
new file mode 100755
index 0000000..354fef6
--- /dev/null
+++ b/locale/pl_PL/ViewerStrings.properties
@@ -0,0 +1,308 @@
+# -- UI related messages for the context menu on the map, in addition to messages from the api --
+#
+contextMenuText=O aplikacji ArcGIS Viewer for Flex...
+aboutText=Ta aplikacja korzysta z produktu ArcGIS Viewer for Flex w wersji 3.0.\nData kompilacji 2012-06-06.
+aboutLearnMoreBtn=Dowiedz się więcej
+aboutCloseBtn=Zamknij
+
+# -- Widget Template Strings --
+#
+close=Zamknij
+minimize=Minimalizuj
+
+# --- general locale specifics
+locateExampleValueX=21.011
+locateExampleValueY=52.23
+
+# -- Generic strings --
+clearLabel=Wyczyść
+deleteLabel=Usuń
+loadingLabel=Wczytywanie...
+okLabel=OK
+errorLabel=Błąd
+problemLabel=Problem
+noFeatures=Nie odnaleziono obiektów.
+resultsLabel=Wyniki
+saveLabel=Zapisz
+
+# --- Units Strings --
+unitsFeet=Stopy
+unitsFeetAbbr=ft
+unitsKilometers=Kilometry
+unitsKilometersAbbr=km
+unitsMeters=Metry
+unitsMetersAbbr=m
+unitsMiles=Mile
+unitsMilesAbbr=mi
+unitsYards=Jardy
+unitsYardsAbbr=yd
+
+unitsAcres=Akry
+unitsAcresAbbr=ac
+unitsHectares=Hektary
+unitsHectaresAbbr=ha
+unitsSquareFeet=Stopy kwadratowe
+unitsSquareFeetAbbr=sq ft
+unitsSquareKilometers=Kilometry kwadratowe
+unitsSquareKilometersAbbr=km kw
+unitsSquareMeters=Metry kwadratowe
+unitsSquareMetersAbbr=m kw
+unitsSquareMiles=Mile kwadratowe
+unitsSquareMilesAbbr=sq mi
+unitsSquareYards=Jardy kwadratowe
+unitsSquareYardsAbbr=sq yd
+
+########## TOC
+tocMapLayerZoomToLabel=Powiększ do
+tocMapLayerTransparencyLabel=Przezroczystość
+tocMapLayerOpaqueLabel=Nieprzezroczysty
+tocMapLayerTransparentLabel=Przezroczysty
+tocMapLayerMoveUpLabel=Przesuń w górę
+tocMapLayerMoveDownLabel=Przesuń w dół
+tocMapLayerRemoveLabel=Usuń
+tocMapLayerDescriptionLabel=Opis
+tocMapLayerDownloadLabel=Pobierz
+
+########## MapManager
+incorrectLayerTypeText={0} nie jest obsługiwanym typem warstwy tematycznej.  Zamiast tego użyj „arcims”, „bing”, „dynamic”, „feature”, „image”, „kml”, „osm”, „tiled” lub „wms”.
+
+########## Base Widget and ConfigManager
+missingConfigFileText=Nie można było odnaleźć {0}
+parseConfigErrorText=Wystąpił problem podczas analizy pliku konfiguracyjnego {0}
+httpResponseStatus=status odpowiedzi protokołu http: {0}
+faultCode=Kod usterki: {0}
+faultInfo=Informacje o usterce: {0}
+faultDetail=Szczegóły dot. usterki: {0}
+
+########## Base Widget and MapManager
+configFileCrossDomain=Możliwy problem z ruchem międzydomenowym: {0}{1}
+
+########## Overview Map "Widget"
+openToolTip=Kliknij, aby wyświetlić podgląd mapy
+closeToolTip=Kliknij, aby zamknąć podgląd mapy
+
+########## MapSwitcher Widget
+layerListLabel=Więcej...
+basemap=Mapa bazowa
+
+########## HeaderController Widget
+aboutLabel=Informacje
+
+########## Navigation Widget
+fullExtentLabel=Pełny Zasięg
+panDownLabel=Przesuń w dół
+panLeftLabel=Przesuń w lewo
+panRightLabel=Przesuń w prawo
+panUpLabel=Przesuń w górę
+previousExtentLabel=Poprzedni zasięg
+nextExtentLabel=Następny zasięg
+panLabel=Przesuń
+zoomInLabel=Powiększenie
+zoomOutLabel=Pomniejszenie
+
+# -- Common draw strings --
+
+
+# -- Draw Strings --
+#
+addTextLabel=Dodaj tekst
+drawPointLabel=Rysuj punkt
+drawLineLabel=Rysuj linię
+drawFreehandLineLabel=Rysuj dowolną linię
+drawPolygonLabel=Rysuj poligon
+drawFreehandPolygonLabel=Rysuj dowolny poligon
+drawRectangleLabel=Rysuj prostokąt
+drawCircleLabel=Rysuj okrąg
+drawEllipseLabel=Rysuj elipsę
+drawClearLabel=Wyczyść rysunki
+
+markerStyleCircle=Koło
+markerStyleCross=Krzyż
+markerStyleDiamond=Romb
+markerStyleSquare=Kwadrat
+markerStyleTriangle=Trójkąt
+markerStyleX=X
+
+textFont1=Courier New
+textFont2=Arial
+textFont3=Broadway
+textFont4=Comic Sans MS
+textFont5=Algerian
+textFont6=Verdana
+
+lineStyleSolid=Pełna
+lineStyleDash=Przerywana
+lineStyleDot=Kropkowana
+lineStyleDashDot=Kreska-kropka
+lineStyleDashDotDot=Kreska-kropka-kropka
+
+fillStyleSolid=Pełna
+fillStyleBackwardDiagonal=Ukośnie odwrotnie
+fillStyleCross=Krzyż
+fillStyleForwardDiagonal=Ukośnie
+fillStyleHorizontal=Poziomo
+fillStyleVertical=Pionowo
+
+# -- Symbol Strings --
+#
+markerAlphaLabel=Alfa
+markerColorLabel=Kolor znacznika
+markerSizeLabel=Rozmiar
+markerStyleLabel=Styl
+markerOutlineColorLabel=Kolor obrysu
+markerOutlineWidthLabel=Szerokość
+textLabel=Tekst
+textColorLabel=Kolor
+textFontLabel=Czcionka
+textSizeLabel=Rozmiar
+textBoldLabel=B
+textBoldTooltip=Pogrubiony
+textItalicLabel=I
+textItalicTooltip=Kursywa
+textUnderlineLabel=U
+textUnderlineTooltip=Podkreślenie
+lineAlphaLabel=Alfa
+lineColorLabel=Kolor linii
+lineStyleLabel=Styl
+lineWidthLabel=Szerokość
+fillAlphaLabel=Alfa
+fillColorLabel=Kolor wypełnienia
+fillStyleLabel=Styl
+fillOutlineColorLabel=Kolor obrysu
+fillOutlineWidthLabel=Szerokość
+
+#
+# -- Measurement Strings --
+#
+showMeasurementsLabel=Pokaż jednostki miary
+distanceUnitsLabel=Jednostki odległości
+areaUnitsLabel=Jednostka powierzchni
+areaLabel=Powierzchnia:
+perimeterLabel=Obwód:
+lengthLabel=Długość:
+
+########## Bookmark Widget
+bookmarksLabel=Zakładki
+addbookmarksLabel=Dodaj zakładkę
+addLabel=Dodaj bieżący zasięg jako zakładkę o nazwie
+bookmarkSubmitLabel=Dodaj zakładkę
+bookmarkMissingNameLabel=Wpisz nazwę zakładki.
+
+########## Data Extract Widget
+descLabel=Wyodrębnij dane i pobierz plik zip
+step1Label=1. Zaznacz obszar
+dataCurrentExtentLabel=Dane zostaną wyodrębnione z bieżącego zasięgu.
+step2Label=2. Wybierz warstwy tematyczne do wyodrębnienia
+step3Label=3. Wybierz format pliku
+step4Label=4. Wybierz format obrazu rastrowego
+step5Label=5. Odniesienie przestrzenne
+extractButtonLabel=Wyodrębnij
+step1ErrorLabel=Wybierz obszar zainteresowania.
+step2ErrorLabel=Wybierz warstwy tematyczne do wyodrębnienia.
+emptyResultsLabel=Zadanie zostało zakończone, ale nie zwróciło żadnych wyników.
+saveDataFileLabel=Plik danych został utworzony. Czy chcesz go zapisać?
+
+########## Edit Widget
+attributesLabel=Atrybuty
+attachmentsLabel=Załączniki
+featureLayerOutOfScaleText=Ta warstwa tematyczna obiektu znajduje się poza zakresem skali
+showAttachmentsText=Pokaż załączniki
+showAttributesText=Pokaż atrybuty
+selectTemplateText=Wybierz szablon, aby utworzyć obiekt
+noEditableLayersText=Brak edytowalnych warstw tematycznych.
+noCreateCapabilityLayersText=Żadna z tych warstw tematycznych nie ma możliwości tworzenia
+layerNotSupportingAttachmentsText=Ta warstwa tematyczna nie obsługuje załączników
+noAttachmentsText=Brak załączników
+chooseFileText=Wybierz plik, który chcesz załączyć
+attachmentSubmitLabel=Prześlij
+attachmentCancelLabel=Anuluj
+singleAttachmentText=Obiekt ma {0} załącznik
+multipleAttachmentsText=Obiekt ma {0} załączników
+
+########## LayerList Widget
+layerListTitle=Widoczność warstwy tematycznej
+
+########## Locate Widget
+locateSubmitLabel=Lokalizuj
+addressLabel=Adres
+coordinatesLabel=Współrzędne
+addressTitle=Wprowadź adres
+coordinatesTitle=Wprowadź współrzędne
+xLabel=Długość geograficzna (X)
+yLabel=Szerokość geograficzna (Y)
+locationsLabel=Znalezione lokalizacje:
+bingCulture=pl-PL
+requiredFields=Wymagane pola:
+requiredField=Wymagane pole:
+deleteResultTooltip=Usuń wynik
+resultScoreText=Wynik:
+bingResultConfidenceText=Poziom ufności:
+
+########## Print Widget
+printSubmitLabel=Drukuj
+printTitle=
+printSubtitle=
+printCopyright=
+printTitleLabel=Tytuł
+printSubtitleLabel=Podtytuł
+printCopyrightLabel=Prawa autorskie
+printAuthorLabel=Autor
+printLayoutTemplatesLabel=Szablony układu
+printFormatsLabel=Formaty
+printScaleLabel=Użyj tej skali
+
+########## Query Widget
+filterTitleBarTooltip=Filtruj wyniki
+showallTitleBarTooltip=Pokaż wszystkie
+filterButtonLabel=Filtr
+clearButtonLabel=Pokaż wszystkie
+featuresFoundLabel=Znalezione obiekty: {0}
+
+########## Routing Widget
+drivingDirectionLabel=Informacje dla kierowców
+routeSubmitLabel=Wyznacz trasę
+moveUpTooltip=Przesuń w górę
+moveDownTooltip=Przesuń w dół
+addLocationTooltip=kliknij obszar na mapie, aby dodać lokalizację
+optionsLabel=Opcje
+bestSequenceLabel=Znajdź najlepszą trasę
+milesLabel=Mile
+metricLabel=Km
+changeRouteSymbolLabel=Zmień symbol trasy
+editRouteLabel=Edytuj trasę
+
+########## Search Widget
+graphicalTitleBarTooltip=Wybierz obiekty
+textTitleBarTooltip=Wybierz według atrybutu
+graphicalsearchLabel=Wybierz obiekty według
+textsearchLabel=Wybierz według atrybutu
+layerLabel=Przeszukaj warstwę tematyczną
+nolayerLabel=Nie zdefiniowano warstwy tematycznej do przeszukania.
+searchSubmitLabel=Wyszukaj
+selectionLabel=Wybrane obiekty:
+
+########## Coordinate Widget
+latitudeLabel=Szerokość geograficzna
+longitudeLabel=Długość geograficzna
+
+########## GP widget
+gpSubmitLabel=Prześlij
+inputLabel=Dane wejściowe
+helpLabel=Pomoc
+outputLabel=Dane wynikowe
+copyToClipboard=Kopiuj do schowka
+unsupportedInputType={0} dane wejściowe nie są obsługiwane
+
+########## Popups
+zoomLabel=Powiększ do
+
+########## Hello Widget
+helloContent=Zmień ten tekst w pliku konfiguracyjnym.
+
+########## Chart Widget
+layerSelectionLabel=Wybierz warstwę tematyczną
+drawToolMenuLabel=Wybierz narzędzie do rysowania
+selectLabel=Wybierz
+noLayersLabel=Brak warstw tematycznych
+noChartDataToDisplayLabel=Brak danych diagramu do wyświetlenia
+featureLayerNotVisibleText=Warstwa tematyczna obiektu jest niewidoczna lub znajduje się poza zakresem skali
\ No newline at end of file
diff --git a/locale/pt_BR/ViewerStrings.properties b/locale/pt_BR/ViewerStrings.properties
old mode 100644
new mode 100755
index fe246a5..86e45b0
--- a/locale/pt_BR/ViewerStrings.properties
+++ b/locale/pt_BR/ViewerStrings.properties
@@ -1,8 +1,8 @@
 # -- UI related messages for the context menu on the map, in addition to messages from the api --
 #
 contextMenuText=Sobre o ArcGIS Viewer for Flex...
-aboutText=Este aplicativo utiliza a versão 3.0Prerelease do ArcGIS Viewer for Flex.\nData de desenvolvimento 2012-03-15.
-aboutLearnMoreBtn=Saiba mais
+aboutText=Este aplicativo utiliza a versão 3.0 do ArcGIS Viewer for Flex.\nData de desenvolvimento 2012-06-06.
+aboutLearnMoreBtn=Obter mais informações
 aboutCloseBtn=Fechar
 
 # -- Widget Template Strings --
@@ -23,6 +23,7 @@ errorLabel=Erro
 problemLabel=Problema
 noFeatures=Nenhuma feição foi encontrada.
 resultsLabel=Resultados
+saveLabel=Salvar
 
 # --- Units Strings --
 unitsFeet=Pés
@@ -83,7 +84,6 @@ closeToolTip=Clique para fechar um mapa de visão geral
 ########## MapSwitcher Widget
 layerListLabel=Mais...
 basemap=Mapa Base
-selectBasemap=Selecione um mapa base
 
 ########## HeaderController Widget
 aboutLabel=Sobre
@@ -123,7 +123,7 @@ markerStyleSquare=Quadrado
 markerStyleTriangle=Triângulo
 markerStyleX=X
 
-textFont1=Courier
+textFont1=Courier New
 textFont2=Arial
 textFont3=Broadway
 textFont4=Comic Sans MS
@@ -205,11 +205,12 @@ saveDataFileLabel=Arquivo de dados criado. Deseja salvá-lo?
 ########## Edit Widget
 attributesLabel=Atributos
 attachmentsLabel=Anexos
-featureLayerNotVisibleText=a camada de feição não está visível ou está fora do intervalo de escala
+featureLayerOutOfScaleText=Esta camada de feição está fora da faixa de escala
 showAttachmentsText=Exibir Anexos
 showAttributesText=Exibir Atributos
 selectTemplateText=Selecione o modelo para criar a feição
 noEditableLayersText=Nenhuma camada pode ser editada.
+noCreateCapabilityLayersText=Nenhuma das camadas criou o recurso
 layerNotSupportingAttachmentsText=Esta camada não suporta anexos
 noAttachmentsText=Sem anexos
 chooseFileText=Escolha um arquivo para anexar
@@ -304,3 +305,4 @@ drawToolMenuLabel=Selecionar ferramenta de desenho
 selectLabel=Selecionar
 noLayersLabel=Nenhum camada
 noChartDataToDisplayLabel=Nenhum dado de gráfico para exibir
+featureLayerNotVisibleText=a camada de feição não está visível ou está fora da faixa de escala
\ No newline at end of file
diff --git a/locale/ro_RO/ViewerStrings.properties b/locale/ro_RO/ViewerStrings.properties
new file mode 100755
index 0000000..ca86c89
--- /dev/null
+++ b/locale/ro_RO/ViewerStrings.properties
@@ -0,0 +1,308 @@
+# -- UI related messages for the context menu on the map, in addition to messages from the api --
+#
+contextMenuText=Despre ArcGIS Viewer for Flex...
+aboutText=Această aplicaţie utilizează ArcGIS Viewer for Flex versiunea 3.0.\nData creării 2012-06-06.
+aboutLearnMoreBtn=Aflaţi mai multe
+aboutCloseBtn=Închidere
+
+# -- Widget Template Strings --
+#
+close=Închidere
+minimize=Minimizare
+
+# --- general locale specifics
+locateExampleValueX=26.0875
+locateExampleValueY=44.4275
+
+# -- Generic strings --
+clearLabel=Golire
+deleteLabel=Ştergere
+loadingLabel=Încărcare...
+okLabel=OK
+errorLabel=Eroare
+problemLabel=Problemă
+noFeatures=Nu a fost găsit niciun obiect spaţial.
+resultsLabel=Rezultate
+saveLabel=Salvare
+
+# --- Units Strings --
+unitsFeet=Ft
+unitsFeetAbbr=ft
+unitsKilometers=Kilometri
+unitsKilometersAbbr=km
+unitsMeters=Metri
+unitsMetersAbbr=m
+unitsMiles=Mile
+unitsMilesAbbr=mi.
+unitsYards=Yarzi
+unitsYardsAbbr=yd
+
+unitsAcres=Acri
+unitsAcresAbbr=ac
+unitsHectares=Hectare
+unitsHectaresAbbr=ha
+unitsSquareFeet=Ft pătraţi
+unitsSquareFeetAbbr=ft pătraţi
+unitsSquareKilometers=Kilometri pătraţi
+unitsSquareKilometersAbbr=km pătraţi
+unitsSquareMeters=Metri pătraţi
+unitsSquareMetersAbbr=m pătraţi
+unitsSquareMiles=Mile pătrate
+unitsSquareMilesAbbr=mi pătrate
+unitsSquareYards=Yarzi pătraţi
+unitsSquareYardsAbbr=yd pătraţi
+
+########## TOC
+tocMapLayerZoomToLabel=Transfocare la
+tocMapLayerTransparencyLabel=Transparenţă
+tocMapLayerOpaqueLabel=Opac
+tocMapLayerTransparentLabel=Transparent
+tocMapLayerMoveUpLabel=Deplasare în sus
+tocMapLayerMoveDownLabel=Deplasare în jos
+tocMapLayerRemoveLabel=Eliminare
+tocMapLayerDescriptionLabel=Descriere
+tocMapLayerDownloadLabel=Descărcare
+
+########## MapManager
+incorrectLayerTypeText={0} nu este un tip de strat tematic acceptat. În loc, utilizaţi "arcims", "bing", "dynamic", "feature", "image", "kml", "osm", "tiled" sau "wms".
+
+########## Base Widget and ConfigManager
+missingConfigFileText={0} nu a putut fi găsit
+parseConfigErrorText=A survenit o eroare la analiza fişierului de configurare {0}
+httpResponseStatus=Stare răspuns http: {0}
+faultCode=Cod defecţiune: {0}
+faultInfo=Informaţii defecţiune: {0}
+faultDetail=Detalii defecţiune: {0}
+
+########## Base Widget and MapManager
+configFileCrossDomain=Posibilă problemă interdomenii: {0}{1}
+
+########## Overview Map "Widget"
+openToolTip=Faceţi clic pentru a deschide harta de verificare
+closeToolTip=Faceţi clic pentru a închide harta de verificare
+
+########## MapSwitcher Widget
+layerListLabel=Mai mult...
+basemap=Hartă fundal
+
+########## HeaderController Widget
+aboutLabel=Despre
+
+########## Navigation Widget
+fullExtentLabel=Extindere completă
+panDownLabel=Panoramare în jos
+panLeftLabel=Panoramare la stânga
+panRightLabel=Panoramare la dreapta
+panUpLabel=Panoramare în sus
+previousExtentLabel=Extinderea anterioară
+nextExtentLabel=Extinderea următoare
+panLabel=Panoramare
+zoomInLabel=Apropiere
+zoomOutLabel=Îndepărtare
+
+# -- Common draw strings --
+
+
+# -- Draw Strings --
+#
+addTextLabel=Adăugare text
+drawPointLabel=Trasare punct
+drawLineLabel=Trasare linie
+drawFreehandLineLabel=Trasare linie liberă
+drawPolygonLabel=Trasare poligon
+drawFreehandPolygonLabel=Trasare poligon liber
+drawRectangleLabel=Trasare dreptunghi
+drawCircleLabel=Trasare cerc
+drawEllipseLabel=Trasare elipsă
+drawClearLabel=Ştergere desene
+
+markerStyleCircle=Cerc
+markerStyleCross=Cruce
+markerStyleDiamond=Diamant
+markerStyleSquare=Pătrat
+markerStyleTriangle=Triunghi
+markerStyleX=X
+
+textFont1=Courier New
+textFont2=Arial
+textFont3=Broadway
+textFont4=Comic Sans MS
+textFont5=Algerian
+textFont6=Verdana
+
+lineStyleSolid=Linie continuă
+lineStyleDash=Linie întreruptă
+lineStyleDot=Linie punctată
+lineStyleDashDot=Linie punct
+lineStyleDashDotDot=Linie punct punct
+
+fillStyleSolid=Linie continuă
+fillStyleBackwardDiagonal=Diagonală înapoi
+fillStyleCross=Cruce
+fillStyleForwardDiagonal=Diagonală înainte
+fillStyleHorizontal=Orizontal
+fillStyleVertical=Vertical
+
+# -- Symbol Strings --
+#
+markerAlphaLabel=Alfa
+markerColorLabel=Culoare marcator
+markerSizeLabel=Dimensiune
+markerStyleLabel=Stil
+markerOutlineColorLabel=Culoare contur
+markerOutlineWidthLabel=Lăţime
+textLabel=Text
+textColorLabel=Culoare
+textFontLabel=Font
+textSizeLabel=Dimensiune
+textBoldLabel=B
+textBoldTooltip=Aldin
+textItalicLabel=I
+textItalicTooltip=Cursiv
+textUnderlineLabel=U
+textUnderlineTooltip=Subliniere
+lineAlphaLabel=Alfa
+lineColorLabel=Culoare linie
+lineStyleLabel=Stil
+lineWidthLabel=Lăţime
+fillAlphaLabel=Alfa
+fillColorLabel=Culoare de umplere
+fillStyleLabel=Stil
+fillOutlineColorLabel=Culoare contur
+fillOutlineWidthLabel=Lăţime
+
+#
+# -- Measurement Strings --
+#
+showMeasurementsLabel=Afişare măsurători
+distanceUnitsLabel=Unităţi pentru distanţă
+areaUnitsLabel=Unităţi pentru suprafaţă
+areaLabel=Suprafaţă:
+perimeterLabel=Perimetru:
+lengthLabel=Lungime:
+
+########## Bookmark Widget
+bookmarksLabel=Semne de carte
+addbookmarksLabel=Adăugare semn de carte
+addLabel=Adăugare extindere curentă ca semn de carte denumit
+bookmarkSubmitLabel=Adăugare semn de carte
+bookmarkMissingNameLabel=Introduceţi un nume pentru semnul de carte.
+
+########## Data Extract Widget
+descLabel=Extrageţi date şi descărcaţi fişierul zip
+step1Label=1. Selectare suprafaţă
+dataCurrentExtentLabel=Datele vor fi extrase din extinderea dvs. curentă.
+step2Label=2. Selectare straturi tematice de extras
+step3Label=3. Selectare format de fişiere
+step4Label=4. Selectare format raster
+step5Label=5. Referinţă spaţială
+extractButtonLabel=Extragere
+step1ErrorLabel=Selectaţi o suprafaţă de interes.
+step2ErrorLabel=Selectaţi straturi tematice de extras.
+emptyResultsLabel=Operaţia a fost finalizată, însă nu a returnat niciun rezultat.
+saveDataFileLabel=Fişier de date creat. Doriţi să îl salvaţi?
+
+########## Edit Widget
+attributesLabel=Atribute
+attachmentsLabel=Ataşări
+featureLayerOutOfScaleText=Acest strat tematic de obiecte spaţiale nu se încadrează în intervalul de scară
+showAttachmentsText=Afişare ataşări
+showAttributesText=Afişare atribute
+selectTemplateText=Selectare şablon pentru a crea obiectul spaţial
+noEditableLayersText=Niciun strat tematic editabil.
+noCreateCapabilityLayersText=Niciunul din straturile tematice nu a creat o capabilitate
+layerNotSupportingAttachmentsText=Acest strat tematic nu acceptă ataşări
+noAttachmentsText=Nicio ataşare
+chooseFileText=Alegeţi un fişier pentru ataşare
+attachmentSubmitLabel=Trimitere
+attachmentCancelLabel=Anulare
+singleAttachmentText=Obiectul spaţial are {0} ataşare
+multipleAttachmentsText=Obiectul spaţial are {0} ataşări
+
+########## LayerList Widget
+layerListTitle=Vizibilitate strat tematic
+
+########## Locate Widget
+locateSubmitLabel=Localizare
+addressLabel=Adresă
+coordinatesLabel=Coordonate
+addressTitle=Introducere adresă
+coordinatesTitle=Introducere coordonate
+xLabel=Longitudine (X)
+yLabel=Latitudine (Y)
+locationsLabel=Locaţii găsite:
+bingCulture=ro-RO
+requiredFields=Câmpuri obligatorii:
+requiredField=Câmp obligatoriu:
+deleteResultTooltip=Ştergere rezultat
+resultScoreText=Scor:
+bingResultConfidenceText=Încredere:
+
+########## Print Widget
+printSubmitLabel=Imprimare
+printTitle=
+printSubtitle=
+printCopyright=
+printTitleLabel=Titlu
+printSubtitleLabel=Subtitlu
+printCopyrightLabel=Drepturi de autor
+printAuthorLabel=Autor
+printLayoutTemplatesLabel=Şabloane de configuraţii
+printFormatsLabel=Formate
+printScaleLabel=Utilizare această scară
+
+########## Query Widget
+filterTitleBarTooltip=Filtrare rezultate
+showallTitleBarTooltip=Afişare toate
+filterButtonLabel=Filtru
+clearButtonLabel=Afişare toate
+featuresFoundLabel=Obiecte spaţiale găsite: {0}
+
+########## Routing Widget
+drivingDirectionLabel=Indicaţii pentru conducători auto
+routeSubmitLabel=Obţinere indicaţii
+moveUpTooltip=Deplasare în sus
+moveDownTooltip=Deplasare în jos
+addLocationTooltip=clic pe hartă pentru a adăuga o locaţie
+optionsLabel=Opţiuni
+bestSequenceLabel=Găsire ordine optimă
+milesLabel=Mile
+metricLabel=Km
+changeRouteSymbolLabel=Modificare simbol rută
+editRouteLabel=Editare rută
+
+########## Search Widget
+graphicalTitleBarTooltip=Selectare obiecte spaţiale
+textTitleBarTooltip=Selectare după atribut
+graphicalsearchLabel=Selectare obiecte spaţiale după
+textsearchLabel=Selectare după atribut
+layerLabel=Căutare strat tematic
+nolayerLabel=Nu a fost definit niciun strat tematic de căutare.
+searchSubmitLabel=Căutare
+selectionLabel=Obiecte spaţiale selectate:
+
+########## Coordinate Widget
+latitudeLabel=Latitudine
+longitudeLabel=Longitudine
+
+########## GP widget
+gpSubmitLabel=Trimitere
+inputLabel=Intrare
+helpLabel=Ajutor
+outputLabel=Ieşire
+copyToClipboard=Copiere în Clipboard
+unsupportedInputType=Intrarea {0} nu este acceptată
+
+########## Popups
+zoomLabel=Transfocare la
+
+########## Hello Widget
+helloContent=Modificaţi acest text în fişierul de configurare.
+
+########## Chart Widget
+layerSelectionLabel=Selectare strat tematic
+drawToolMenuLabel=Selectare instrument de trasare
+selectLabel=Selectare
+noLayersLabel=Niciun strat tematic
+noChartDataToDisplayLabel=Nu există date de afişat pentru diagramă
+featureLayerNotVisibleText=stratul tematic fie nu este vizibil, fie depăşeşte intervalul scării
\ No newline at end of file
diff --git a/locale/ru_RU/ViewerStrings.properties b/locale/ru_RU/ViewerStrings.properties
old mode 100644
new mode 100755
index b927f8b..f2040bf
--- a/locale/ru_RU/ViewerStrings.properties
+++ b/locale/ru_RU/ViewerStrings.properties
@@ -1,7 +1,7 @@
 # -- UI related messages for the context menu on the map, in addition to messages from the api --
 #
 contextMenuText=О программе ArcGIS Viewer for Flex...
-aboutText=Это приложение использует ArcGIS Viewer for Flex версии 3.0Prerelease.\nДата сборки: 2012-03-15.
+aboutText=Это приложение использует ArcGIS Viewer for Flex версии 3.0.\nДата сборки: 2012-06-06.
 aboutLearnMoreBtn=Более подробно
 aboutCloseBtn=Закрыть
 
@@ -23,6 +23,7 @@ errorLabel=Ошибка
 problemLabel=Проблема
 noFeatures=Объекты не найдены.
 resultsLabel=Результаты
+saveLabel=Сохранить
 
 # --- Units Strings --
 unitsFeet=Футы
@@ -67,7 +68,7 @@ incorrectLayerTypeText={0} не является поддерживаемым т
 
 ########## Base Widget and ConfigManager
 missingConfigFileText=Не удалось найти {0}
-parseConfigErrorText=При синтаксическом анализе файла конфигурации {0} возникла проблема
+parseConfigErrorText=Возникла проблема при синтаксическом анализе файла конфигурации {0}
 httpResponseStatus=Статус отклика HTTP: {0}
 faultCode=Код сбоя: {0}
 faultInfo=Информация о сбое: {0}
@@ -83,7 +84,6 @@ closeToolTip=Щелкните, чтобы закрыть обзорную кар
 ########## MapSwitcher Widget
 layerListLabel=Дополнительно...
 basemap=Базовая карта
-selectBasemap=Выберите карту
 
 ########## HeaderController Widget
 aboutLabel=О программе
@@ -123,7 +123,7 @@ markerStyleSquare=Квадрат
 markerStyleTriangle=Треугольник
 markerStyleX=X
 
-textFont1=Courier
+textFont1=Courier New
 textFont2=Arial
 textFont3=Broadway
 textFont4=Comic Sans MS
@@ -155,11 +155,11 @@ textLabel=Текст
 textColorLabel=Цвет
 textFontLabel=Шрифт
 textSizeLabel=Размер
-textBoldLabel=B
-textBoldTooltip=Жирный
-textItalicLabel=I
+textBoldLabel=Ж
+textBoldTooltip=Полужирный
+textItalicLabel=К
 textItalicTooltip=Курсив
-textUnderlineLabel=U
+textUnderlineLabel=Ч
 textUnderlineTooltip=Подчеркнутый
 lineAlphaLabel=Прозрачность
 lineColorLabel=Цвет линии
@@ -184,7 +184,7 @@ lengthLabel=Длина:
 ########## Bookmark Widget
 bookmarksLabel=Закладки
 addbookmarksLabel=Добавить закладку
-addLabel=Закладка для текущего экстента под именем
+addLabel=Добавить закладку для текущего экстента с именем
 bookmarkSubmitLabel=Добавить закладку
 bookmarkMissingNameLabel=Введите имя закладки.
 
@@ -197,7 +197,7 @@ step3Label=3. Выберите формат файла
 step4Label=4. Выберите формат растра
 step5Label=5. Пространственная привязка
 extractButtonLabel=Извлечь
-step1ErrorLabel=Выберите область интересов.
+step1ErrorLabel=Выберите область интереса.
 step2ErrorLabel=Выберите слои для извлечения.
 emptyResultsLabel=Задание выполнено, но результатов не получено.
 saveDataFileLabel=Файл данных создан. Сохранить его?
@@ -205,11 +205,12 @@ saveDataFileLabel=Файл данных создан. Сохранить его?
 ########## Edit Widget
 attributesLabel=Атрибуты
 attachmentsLabel=Вложения
-featureLayerNotVisibleText=векторный слой невидим или находится за пределами измерения
+featureLayerOutOfScaleText=Векторный слой находится вне диапазона масштабирования
 showAttachmentsText=Показать вложения
 showAttributesText=Показать атрибуты
-selectTemplateText=Выбрать шаблон для создания объекта
+selectTemplateText=Выберите шаблон для создания объекта
 noEditableLayersText=Отсутствуют доступные для редактирования слои.
+noCreateCapabilityLayersText=Ни один из слоев не поддерживает возможность создания
 layerNotSupportingAttachmentsText=Этот слой не поддерживает вложения
 noAttachmentsText=Без вложений
 chooseFileText=Выберите файл для вложения
@@ -304,3 +305,4 @@ drawToolMenuLabel=Выберите инструмент для рисовани
 selectLabel=Выбрать
 noLayersLabel=Отсутствуют слои
 noChartDataToDisplayLabel=Отсутствуют данные диаграммы для отображения
+featureLayerNotVisibleText=векторный слой невидим или находится за пределами измерения
\ No newline at end of file
diff --git a/locale/sv_SE/ViewerStrings.properties b/locale/sv_SE/ViewerStrings.properties
new file mode 100755
index 0000000..964cbd2
--- /dev/null
+++ b/locale/sv_SE/ViewerStrings.properties
@@ -0,0 +1,308 @@
+# -- UI related messages for the context menu on the map, in addition to messages from the api --
+#
+contextMenuText=Om ArcGIS Viewer for Flex...
+aboutText=Det här programmet använder ArcGIS Viewer for Flex version 3.0.\nKompileringsdatum 2012-06-06.
+aboutLearnMoreBtn=Läs mer
+aboutCloseBtn=Stäng
+
+# -- Widget Template Strings --
+#
+close=Stäng
+minimize=Minimera
+
+# --- general locale specifics
+locateExampleValueX=13.1933
+locateExampleValueY=55.7058
+
+# -- Generic strings --
+clearLabel=Radera
+deleteLabel=Ta bort
+loadingLabel=Läser in...
+okLabel=OK
+errorLabel=Fel
+problemLabel=Problem
+noFeatures=Hittade inga objekt.
+resultsLabel=Resultat
+saveLabel=Spara
+
+# --- Units Strings --
+unitsFeet=Fot
+unitsFeetAbbr=ft
+unitsKilometers=Kilometer
+unitsKilometersAbbr=km
+unitsMeters=Meter
+unitsMetersAbbr=m
+unitsMiles=Mile
+unitsMilesAbbr=mi
+unitsYards=Yard
+unitsYardsAbbr=yd
+
+unitsAcres=Acres
+unitsAcresAbbr=ac
+unitsHectares=Hektar
+unitsHectaresAbbr=ha
+unitsSquareFeet=Square feet
+unitsSquareFeetAbbr=sq ft
+unitsSquareKilometers=Kvadratkilometer
+unitsSquareKilometersAbbr=km2
+unitsSquareMeters=Kvadratmeter
+unitsSquareMetersAbbr=m2
+unitsSquareMiles=Square miles
+unitsSquareMilesAbbr=sq mi
+unitsSquareYards=Square yards
+unitsSquareYardsAbbr=sq yd
+
+########## TOC
+tocMapLayerZoomToLabel=Zooma till
+tocMapLayerTransparencyLabel=Transparens
+tocMapLayerOpaqueLabel=Opak
+tocMapLayerTransparentLabel=Transparent
+tocMapLayerMoveUpLabel=Flytta uppåt
+tocMapLayerMoveDownLabel=Flytta nedåt
+tocMapLayerRemoveLabel=Ta bort
+tocMapLayerDescriptionLabel=Beskrivning
+tocMapLayerDownloadLabel=Hämta
+
+########## MapManager
+incorrectLayerTypeText={0} är inte en lagertyp som stöds.  Använd "arcims", "bing", "dynamic", "feature", "image", "kml", "osm", "tiled" eller "wms".
+
+########## Base Widget and ConfigManager
+missingConfigFileText=Det gick inte att hitta {0}
+parseConfigErrorText=Det uppstod ett problem när konfigurationsfilen {0} skulle parsas
+httpResponseStatus=http-svarsstatus: {0}
+faultCode=Felkod: {0}
+faultInfo=Felinformation: {0}
+faultDetail=Feldetaljer: {0}
+
+########## Base Widget and MapManager
+configFileCrossDomain=Möjligt korsdomänproblem: {0}{1}
+
+########## Overview Map "Widget"
+openToolTip=Klicka för att öppna översiktskarta
+closeToolTip=Klicka för att stänga översiktskarta
+
+########## MapSwitcher Widget
+layerListLabel=Mer...
+basemap=Baskarta
+
+########## HeaderController Widget
+aboutLabel=Om
+
+########## Navigation Widget
+fullExtentLabel=Full utsträckning
+panDownLabel=Panorera nedåt
+panLeftLabel=Panorera vänster
+panRightLabel=Panorera höger
+panUpLabel=Panorera uppåt
+previousExtentLabel=Föregående utsträckning
+nextExtentLabel=Nästa utsträckning
+panLabel=Panorera
+zoomInLabel=Zooma in
+zoomOutLabel=Zooma ut
+
+# -- Common draw strings --
+
+
+# -- Draw Strings --
+#
+addTextLabel=Lägg till text
+drawPointLabel=Rita punkt
+drawLineLabel=Rita linje
+drawFreehandLineLabel=Rita frihandslinje
+drawPolygonLabel=Rita polygon
+drawFreehandPolygonLabel=Rita frihandspolygon
+drawRectangleLabel=Rita rektangel
+drawCircleLabel=Rita cirkel
+drawEllipseLabel=Rita ellips
+drawClearLabel=Rensa ritobjekt
+
+markerStyleCircle=Cirkel
+markerStyleCross=Kors
+markerStyleDiamond=Romb
+markerStyleSquare=Fyrkant
+markerStyleTriangle=Triangel
+markerStyleX=X
+
+textFont1=Courier New
+textFont2=Arial
+textFont3=Broadway
+textFont4=Comic Sans MS
+textFont5=Algerian
+textFont6=Verdana
+
+lineStyleSolid=Heldragen
+lineStyleDash=Streck
+lineStyleDot=Punkt
+lineStyleDashDot=Streck punkt
+lineStyleDashDotDot=Streck punkt punkt
+
+fillStyleSolid=Heldragen
+fillStyleBackwardDiagonal=Bakåtvänd diagonal
+fillStyleCross=Kors
+fillStyleForwardDiagonal=Framåtvänd diagonal
+fillStyleHorizontal=Horisontell
+fillStyleVertical=Vertikal
+
+# -- Symbol Strings --
+#
+markerAlphaLabel=Alfa
+markerColorLabel=Markeringsfärg
+markerSizeLabel=Storlek
+markerStyleLabel=Format
+markerOutlineColorLabel=Konturfärg
+markerOutlineWidthLabel=Bredd
+textLabel=Text
+textColorLabel=Färg
+textFontLabel=Teckensnitt
+textSizeLabel=Storlek
+textBoldLabel=F
+textBoldTooltip=Fet
+textItalicLabel=K
+textItalicTooltip=Kursiv
+textUnderlineLabel=U
+textUnderlineTooltip=Understruken
+lineAlphaLabel=Alfa
+lineColorLabel=Linjefärg
+lineStyleLabel=Format
+lineWidthLabel=Bredd
+fillAlphaLabel=Alfa
+fillColorLabel=Fyllningsfärg
+fillStyleLabel=Format
+fillOutlineColorLabel=Konturfärg
+fillOutlineWidthLabel=Bredd
+
+#
+# -- Measurement Strings --
+#
+showMeasurementsLabel=Visa mått
+distanceUnitsLabel=Distansenheter
+areaUnitsLabel=Areaenheter
+areaLabel=Area:
+perimeterLabel=Perimeter:
+lengthLabel=Längd:
+
+########## Bookmark Widget
+bookmarksLabel=Bokmärken
+addbookmarksLabel=Lägg till bokmärke
+addLabel=Lägg till aktuell utsträckning som ett bokmärke med namnet
+bookmarkSubmitLabel=Lägg till bokmärke
+bookmarkMissingNameLabel=Ange ett namn på bokmärket.
+
+########## Data Extract Widget
+descLabel=Extrahera data och hämta zip-fil
+step1Label=1. Markera område
+dataCurrentExtentLabel=Data kommer att extraheras från din nuvarande utsträckning.
+step2Label=2. Välj vilka lager som ska extraheras
+step3Label=3. Välj ett filformat
+step4Label=4. Välj rastreringsformat
+step5Label=5. Rumsreferens
+extractButtonLabel=Extrahera
+step1ErrorLabel=Markera det område du är intresserad av.
+step2ErrorLabel=Välj vilka lager som ska extraheras.
+emptyResultsLabel=Åtgärden slutfördes, men inga resultat returnerades.
+saveDataFileLabel=Datafilen har skapats. Vill du spara den?
+
+########## Edit Widget
+attributesLabel=Attribut
+attachmentsLabel=Bilagor
+featureLayerOutOfScaleText=Det här objektlagret är utanför skalans räckvidd
+showAttachmentsText=Visa bilagor
+showAttributesText=Visa attribut
+selectTemplateText=Välj mall för att skapa objekt
+noEditableLayersText=Inga redigerbara lager.
+noCreateCapabilityLayersText=Inga av lagren kan skapa objekt
+layerNotSupportingAttachmentsText=Det här lagret stöder inte bilagor
+noAttachmentsText=Inga bilagor
+chooseFileText=Välj en fil som ska bifogas
+attachmentSubmitLabel=Utför
+attachmentCancelLabel=Avbryt
+singleAttachmentText=Objektet har {0} bilaga
+multipleAttachmentsText=Objektet har {0} bilagor
+
+########## LayerList Widget
+layerListTitle=Lagersynlighet
+
+########## Locate Widget
+locateSubmitLabel=Leta upp
+addressLabel=Adress
+coordinatesLabel=Koordinater
+addressTitle=Ange adress
+coordinatesTitle=Ange koordinater
+xLabel=Longitud (X)
+yLabel=Latitud (Y)
+locationsLabel=Hittade platser:
+bingCulture=sv-SE
+requiredFields=Obligatoriska fält:
+requiredField=Obligatoriskt fält:
+deleteResultTooltip=Ta bort resultat
+resultScoreText=Poäng:
+bingResultConfidenceText=Konfidens:
+
+########## Print Widget
+printSubmitLabel=Skriv ut
+printTitle=
+printSubtitle=
+printCopyright=
+printTitleLabel=Titel
+printSubtitleLabel=Underrubrik
+printCopyrightLabel=Copyright
+printAuthorLabel=Upphovsman
+printLayoutTemplatesLabel=Layoutmallar
+printFormatsLabel=Format
+printScaleLabel=Använd den här skalan
+
+########## Query Widget
+filterTitleBarTooltip=Filtrera resultat
+showallTitleBarTooltip=Visa alla
+filterButtonLabel=Filter
+clearButtonLabel=Visa alla
+featuresFoundLabel=Hittade objekt: {0}
+
+########## Routing Widget
+drivingDirectionLabel=Vägbeskrivningar
+routeSubmitLabel=Hämta vägbeskrivningar
+moveUpTooltip=Flytta uppåt
+moveDownTooltip=Flytta nedåt
+addLocationTooltip=klicka på kartan för att lägga till plats
+optionsLabel=Alternativ
+bestSequenceLabel=Hitta bästa sekvens
+milesLabel=Mile
+metricLabel=km
+changeRouteSymbolLabel=Ändra vägsymbol
+editRouteLabel=Redigera väg
+
+########## Search Widget
+graphicalTitleBarTooltip=Välj objekt
+textTitleBarTooltip=Välj efter attribut
+graphicalsearchLabel=Välj objekt efter
+textsearchLabel=Välj efter attribut
+layerLabel=Söklager
+nolayerLabel=Inget söklager har definierats.
+searchSubmitLabel=Sök
+selectionLabel=Markerade objekt:
+
+########## Coordinate Widget
+latitudeLabel=Latitud
+longitudeLabel=Longitud
+
+########## GP widget
+gpSubmitLabel=Utför
+inputLabel=Indata
+helpLabel=Hjälp
+outputLabel=Utdata
+copyToClipboard=Kopiera till Urklipp
+unsupportedInputType={0} indata stöds inte
+
+########## Popups
+zoomLabel=Zooma till
+
+########## Hello Widget
+helloContent=Ändra den här texten i konfigurationsfilen.
+
+########## Chart Widget
+layerSelectionLabel=Välj lager
+drawToolMenuLabel=Välj ritverktyg
+selectLabel=Välj
+noLayersLabel=Inga lager
+noChartDataToDisplayLabel=Det finns inga diagramdata att visa
+featureLayerNotVisibleText=objektlagret är inte synligt, eller så är det utanför skalan
\ No newline at end of file
diff --git a/locale/zh_CN/ViewerStrings.properties b/locale/zh_CN/ViewerStrings.properties
old mode 100644
new mode 100755
index 407766c..3780724
--- a/locale/zh_CN/ViewerStrings.properties
+++ b/locale/zh_CN/ViewerStrings.properties
@@ -1,7 +1,7 @@
 # -- UI related messages for the context menu on the map, in addition to messages from the api --
 #
 contextMenuText=关于 ArcGIS Viewer for Flex...
-aboutText=此应用程序是使用 ArcGIS Viewer for Flex 3.0Prerelease 版本构建而成的。\n创建日期 2012-03-15。
+aboutText=此应用程序是使用 ArcGIS Viewer for Flex 3.0 版本构建而成的。\n创建日期 2012-06-06。
 aboutLearnMoreBtn=了解更多信息
 aboutCloseBtn=关闭
 
@@ -23,6 +23,7 @@ errorLabel=错误
 problemLabel=问题
 noFeatures=未找到任何要素。
 resultsLabel=结果
+saveLabel=保存
 
 # --- Units Strings --
 unitsFeet=英尺
@@ -83,7 +84,6 @@ closeToolTip=单击关闭鹰眼图
 ########## MapSwitcher Widget
 layerListLabel=详细信息...
 basemap=基础底图
-selectBasemap=选择一个基础底图
 
 ########## HeaderController Widget
 aboutLabel=关于
@@ -205,11 +205,12 @@ saveDataFileLabel=数据文件已创建。是否要保存它?
 ########## Edit Widget
 attributesLabel=属性
 attachmentsLabel=附件
-featureLayerNotVisibleText=要素图层不可见或超出比例范围
+featureLayerOutOfScaleText=此要素图层超出比例范围
 showAttachmentsText=显示附件
 showAttributesText=显示属性
 selectTemplateText=选择用于创建要素的模板
 noEditableLayersText=没有可编辑的图层。
+noCreateCapabilityLayersText=没有任何图层具有创建功能。
 layerNotSupportingAttachmentsText=此图层不支持附件
 noAttachmentsText=不包含附件
 chooseFileText=选择一个附件
@@ -304,3 +305,4 @@ drawToolMenuLabel=选择绘制工具
 selectLabel=选择
 noLayersLabel=无图层
 noChartDataToDisplayLabel=不显示任何图表数据
+featureLayerNotVisibleText=要素图层不可见或超出比例范围
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
old mode 100644
new mode 100755
index bd1d0d0..c02a9c9
--- a/readme.txt
+++ b/readme.txt
@@ -1,9 +1,9 @@
 ==========================
-ArcGIS Viewer for Flex 3.0Prerelease
-build date 2012-03-15
+ArcGIS Viewer for Flex 3.0
+build date 2012-06-06
 ==========================
 
-This file contains the complete source code for the ArcGIS Viewer for Flex 3.0Prerelease.
+This file contains the complete source code for the ArcGIS Viewer for Flex 3.0.
 
 ============================
 Getting Started - Developers
@@ -11,18 +11,26 @@ Getting Started - Developers
 
 See http://links.esri.com/flexviewer-gettingstarted-developers
 
-1. In Flash Builder 4.5, Go to File Menu -> Import -> Flash Builder project.
+1. In Adobe Flash Builder 4.6, go to "File" -> "Import Flash Builder project..."
 
 2. Keeping "File" option selected, click "Browse..." button.
 
-3. Select flexviewer-3.0Prerelease-src.zip downloaded in step 1, e.g. "C:\Documents and Settings\jack\My Documents\flexviewer-3.0Prerelease-src.zip".
+3. Select flexviewer-3.0-src.zip downloaded in step 1, e.g. "C:\Documents and Settings\jack\My Documents\flexviewer-3.0-src.zip".
 
 4. "Extract new project to:" textbox will be automatically set to location where the project source will reside,
-    e.g. "C:\Documents and Settings\jack\Adobe Flash Builder 4\FlexViewer.
+    e.g. "C:\Documents and Settings\jack\Adobe Flash Builder 4.6\FlexViewer.
     Do not put it onto your web server - you should separate your code location from your output.
 
-5. Click "Finish" button. Project will be created and displayed in the Package Explorer window of Flash Builder 4, e.g. in this case FlexViewer.
+5. Click "Finish" button. Project will be created and displayed in the Package Explorer window of Flash Builder 4.6, e.g. in this case FlexViewer.
 
+6. If prompted to upgrade the project (because it was created with a previous version of Flash Builder), click "OK"
+
+7. If prompted to choose Flex SDK version, select "Flex 4.6.0"
+
+8. If needed, download API Library from http://links.esri.com/flex-api/latest-download.
+   Go to "Project" -> "Properties" -> "Flex Build Path". 
+   Click "Add SWC" and navigate to the agslib-3.0-2012-06-06.swc file.
+      
 
 Optionally:
 
@@ -50,8 +58,8 @@ Optionally:
 More Information
 ================
 
-Flex Viewer: http://help.arcgis.com/en/webapps/flexviewer/index.html
-Flex API http://help.arcgis.com/en/webapi/flex/index.html
+Flex Viewer: http://resources.arcgis.com/en/communities/flex-viewer/
+Flex API http://resources.arcgis.com/en/communities/flex-api/
 
 Flex Viewer License agreement at http://www.apache.org/licenses/LICENSE-2.0.html
 Flex API License agreement at http://www.esri.com/legal/pdfs/mla_e204_e300/english.pdf
diff --git a/src/apps/ar/HeaderControllerWidget.xml b/src/apps/ar/HeaderControllerWidget.xml
old mode 100644
new mode 100755
index 9fc3389..d35c1f7
--- a/src/apps/ar/HeaderControllerWidget.xml
+++ b/src/apps/ar/HeaderControllerWidget.xml
@@ -7,8 +7,8 @@
        <height>375</height>
        <content>
         <![CDATA[<p align='center'><img src='assets/images/globe.png' width='140' height='140' /></p>
-        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer لـ Flex</font></a>
-        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS لـ Flex</font></a>
+        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer for Flex</font></a>
+        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API for Flex</font></a>
         <br><a href="http://www.esri.com" target='_blank'><font color='#FFFF00'>Esri</font></a></p></textformat>
         ]]>
         </content>
diff --git a/src/apps/ar/config.xml b/src/apps/ar/config.xml
old mode 100644
new mode 100755
index 8682808..7f0fca5
--- a/src/apps/ar/config.xml
+++ b/src/apps/ar/config.xml
@@ -7,7 +7,7 @@
 ////////////////////////////////////////////////////////////////////////////
 -->
 <configuration>
-    <title>حول ArcGIS Viewer لـ Flex...</title>
+    <title>ArcGIS Viewer for Flex</title>
     <layoutdirection>rtl</layoutdirection>
     <logo>assets/images/logo.png</logo>
     <style>
@@ -23,12 +23,7 @@
     <widget left="0" top="0" config="apps/ar/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
     <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
 
-    <map initialextent="-1958000 12000 9166000 5481000" top="40" wraparound180="true">
-        <basemaps>
-            <layer label="الشوارع" type="tiled" visible="true" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"/>
-            <layer label="تصوير جوي" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"/>
-            <layer label="طوبو" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"/>
-        </basemaps>
+    <map initialextent="-1958000 12000 9166000 5481000" top="40" wraparound180="true" addarcgisbasemaps="true">
         <operationallayers>
             <layer label="التركيبة السكانية" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
                 <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
diff --git a/src/apps/de_DE/BookmarkWidget.xml b/src/apps/de_DE/BookmarkWidget.xml
old mode 100644
new mode 100755
diff --git a/src/apps/de_DE/HeaderControllerWidget.xml b/src/apps/de_DE/HeaderControllerWidget.xml
old mode 100644
new mode 100755
diff --git a/src/apps/de_DE/config.xml b/src/apps/de_DE/config.xml
old mode 100644
new mode 100755
index 0d07c19..b23f559
--- a/src/apps/de_DE/config.xml
+++ b/src/apps/de_DE/config.xml
@@ -7,8 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////
 -->
 <configuration>
-    <title>Info zu ArcGIS Viewer for Flex...</title>
-    <logo>assets/images/de.png</logo>
+    <title>ArcGIS Viewer for Flex</title>
+    <logo>assets/images/logo.png</logo>
     <style>
         <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
         <alpha>0.8</alpha>
@@ -22,12 +22,7 @@
     <widget left="0" top="0" config="apps/de_DE/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
     <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
 
-    <map initialextent="298000 5719000 2010000 7522000" top="40" wraparound180="true">
-        <basemaps>
-            <layer label="Straßen" type="tiled" visible="true" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"/>
-            <layer label="Luftbild" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"/>
-            <layer label="Topo" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"/>
-        </basemaps>
+    <map initialextent="298000 5719000 2010000 7522000" top="40" wraparound180="true" addarcgisbasemaps="true">
         <operationallayers>
             <layer label="Demographische Daten" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
                 <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
diff --git a/src/apps/es_ES/BookmarkWidget.xml b/src/apps/es_ES/BookmarkWidget.xml
old mode 100644
new mode 100755
diff --git a/src/apps/es_ES/HeaderControllerWidget.xml b/src/apps/es_ES/HeaderControllerWidget.xml
old mode 100644
new mode 100755
index 8f983e3..7bfff32
--- a/src/apps/es_ES/HeaderControllerWidget.xml
+++ b/src/apps/es_ES/HeaderControllerWidget.xml
@@ -8,7 +8,7 @@
        <content>
         <![CDATA[<p align='center'><img src='assets/images/globe.png' width='140' height='140' /></p>
         <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer for Flex</font></a>
-        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API para Flex</font></a>
+        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API for Flex</font></a>
         <br><a href="http://www.esri.com" target='_blank'><font color='#FFFF00'>Esri</font></a></p></textformat>
         ]]>
         </content>
diff --git a/src/apps/es_ES/config.xml b/src/apps/es_ES/config.xml
old mode 100644
new mode 100755
index 8802c83..eb3782f
--- a/src/apps/es_ES/config.xml
+++ b/src/apps/es_ES/config.xml
@@ -7,8 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////
 -->
 <configuration>
-    <title>Acerca de ArcGIS Viewer for Flex...</title>
-    <logo>assets/images/es.png</logo>
+    <title>ArcGIS Viewer for Flex</title>
+    <logo>assets/images/logo.png</logo>
     <style>
         <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
         <alpha>0.8</alpha>
@@ -22,12 +22,7 @@
     <widget left="0" top="0" config="apps/es_ES/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
     <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
 
-    <map initialextent="-1338000 4149000 519000 5619000" top="40" wraparound180="true">
-        <basemaps>
-            <layer label="Calles" type="tiled" visible="true" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"/>
-            <layer label="Aéreo" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"/>
-            <layer label="Topografía" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"/>
-        </basemaps>
+    <map initialextent="-1338000 4149000 519000 5619000" top="40" wraparound180="true" addarcgisbasemaps="true">
         <operationallayers>
             <layer label="Demografía" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
                 <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
diff --git a/src/apps/fr_FR/BookmarkWidget.xml b/src/apps/fr_FR/BookmarkWidget.xml
old mode 100644
new mode 100755
diff --git a/src/apps/fr_FR/HeaderControllerWidget.xml b/src/apps/fr_FR/HeaderControllerWidget.xml
old mode 100644
new mode 100755
index 80d1f26..836cd04
--- a/src/apps/fr_FR/HeaderControllerWidget.xml
+++ b/src/apps/fr_FR/HeaderControllerWidget.xml
@@ -8,7 +8,7 @@
        <content>
         <![CDATA[<p align='center'><img src='assets/images/globe.png' width='140' height='140' /></p>
         <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer for Flex</font></a>
-        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>API ArcGIS for Flex</font></a>
+        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API for Flex</font></a>
         <br><a href="http://www.esri.com" target='_blank'><font color='#FFFF00'>Esri</font></a></p></textformat>
         ]]>
         </content>
diff --git a/src/apps/fr_FR/config.xml b/src/apps/fr_FR/config.xml
old mode 100644
new mode 100755
index ec86f86..46203b3
--- a/src/apps/fr_FR/config.xml
+++ b/src/apps/fr_FR/config.xml
@@ -7,8 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////
 -->
 <configuration>
-    <title>A propos d’ArcGIS Viewer pour Flex...</title>
-    <logo>assets/images/fr.png</logo>
+    <title>ArcGIS Viewer for Flex</title>
+    <logo>assets/images/logo.png</logo>
     <style>
         <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
         <alpha>0.8</alpha>
@@ -22,12 +22,7 @@
     <widget left="0" top="0" config="apps/fr_FR/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
     <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
 
-    <map initialextent="-705000 4906000 1741000 7235000" top="40" wraparound180="true">
-        <basemaps>
-            <layer label="Rues" type="tiled" visible="true" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"/>
-            <layer label="Aérien" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"/>
-            <layer label="Topo" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"/>
-        </basemaps>
+    <map initialextent="-705000 4906000 1741000 7235000" top="40" wraparound180="true" addarcgisbasemaps="true">
         <operationallayers>
             <layer label="Démographiques" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
                 <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
diff --git a/src/apps/it_IT/HeaderControllerWidget.xml b/src/apps/it_IT/HeaderControllerWidget.xml
old mode 100644
new mode 100755
index e189668..9f51f11
--- a/src/apps/it_IT/HeaderControllerWidget.xml
+++ b/src/apps/it_IT/HeaderControllerWidget.xml
@@ -7,8 +7,8 @@
        <height>375</height>
        <content>
         <![CDATA[<p align='center'><img src='assets/images/globe.png' width='140' height='140' /></p>
-        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer per Flex</font></a>
-        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API per Flex</font></a>
+        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer for Flex</font></a>
+        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API for Flex</font></a>
         <br><a href="http://www.esri.com" target='_blank'><font color='#FFFF00'>Esri</font></a></p></textformat>
         ]]>
         </content>
diff --git a/src/apps/it_IT/config.xml b/src/apps/it_IT/config.xml
old mode 100644
new mode 100755
index 29bedc9..f8757c1
--- a/src/apps/it_IT/config.xml
+++ b/src/apps/it_IT/config.xml
@@ -7,8 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////
 -->
 <configuration>
-    <title>Informazioni su ArcGIS Viewer per Flex...</title>
-    <logo>assets/images/it.png</logo>
+    <title>ArcGIS Viewer for Flex</title>
+    <logo>assets/images/logo.png</logo>
     <style>
         <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
         <alpha>0.8</alpha>
@@ -22,12 +22,7 @@
     <widget left="0" top="0" config="apps/it_IT/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
     <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
 
-    <map initialextent="525000 4366000 2409000 5840000" top="40" wraparound180="true">
-        <basemaps>
-            <layer label="Vie" type="tiled" visible="true" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"/>
-            <layer label="Aerea" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"/>
-            <layer label="Topo" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"/>
-        </basemaps>
+    <map initialextent="525000 4366000 2409000 5840000" top="40" wraparound180="true" addarcgisbasemaps="true">
         <operationallayers>
             <layer label="Demografia" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
                 <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
diff --git a/src/apps/ja_JP/BookmarkWidget.xml b/src/apps/ja_JP/BookmarkWidget.xml
old mode 100644
new mode 100755
diff --git a/src/apps/ja_JP/CoordinateWidget.xml b/src/apps/ja_JP/CoordinateWidget.xml
old mode 100644
new mode 100755
diff --git a/src/apps/ja_JP/HeaderControllerWidget.xml b/src/apps/ja_JP/HeaderControllerWidget.xml
old mode 100644
new mode 100755
diff --git a/src/apps/ja_JP/config.xml b/src/apps/ja_JP/config.xml
old mode 100644
new mode 100755
index 1bc91fa..2055998
--- a/src/apps/ja_JP/config.xml
+++ b/src/apps/ja_JP/config.xml
@@ -8,7 +8,7 @@
 -->
 <configuration>
     <title>ArcGIS Viewer for Flex</title>
-    <logo>assets/images/jp.png</logo>
+    <logo>assets/images/logo.png</logo>
     <style>
         <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
         <alpha>0.8</alpha>
@@ -23,12 +23,7 @@
     <widget left="0" top="0" config="apps/ja_JP/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
     <widget left="3" bottom="3" config="apps/ja_JP/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
 
-    <map initialextent="14211000 3338000 16794000 5916000" top="40" wraparound180="true">
-        <basemaps>
-            <layer label="道路地図" type="tiled" visible="true" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"/>
-            <layer label="航空写真" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"/>
-            <layer label="地形図" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"/>
-        </basemaps>
+    <map initialextent="14211000 3338000 16794000 5916000" top="40" wraparound180="true" addarcgisbasemaps="true">
         <operationallayers>
             <layer label="人口統計" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
                 <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
diff --git a/src/apps/ko_KR/BookmarkWidget.xml b/src/apps/ko_KR/BookmarkWidget.xml
new file mode 100755
index 0000000..992ffc8
--- /dev/null
+++ b/src/apps/ko_KR/BookmarkWidget.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<configuration label="Bookmarks (example)">
+    <bookmarks>
+        <bookmark name="Contiguous USA">-13934000 2699500 -8034300 6710900</bookmark>
+        <bookmark name="San Francisco">-13638000 4541000 -13632000 4551000</bookmark>
+        <bookmark name="Louisville, Kentucky">-9559973 4601704 -9529513 4621654</bookmark>
+        <bookmark name="Los Angeles">-13211400 3993400 -13119200 4056100</bookmark>
+        <bookmark name="Japan">13917200 3452300 16908700 5477600</bookmark>
+        <bookmark name="Lisbon">-1039800 4665500 -993700 4696800</bookmark>
+        <bookmark name="Chile">-8732266 -8111526 -6810170 -1859588</bookmark>
+    </bookmarks>
+</configuration>
+
+<!--
+    See Bookmark widget tag reference at
+    http://links.esri.com/bookmarkwidget
+-->
diff --git a/src/apps/ko_KR/HeaderControllerWidget.xml b/src/apps/ko_KR/HeaderControllerWidget.xml
new file mode 100755
index 0000000..d77beee
--- /dev/null
+++ b/src/apps/ko_KR/HeaderControllerWidget.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<configuration>
+    <about>
+       <label>정보</label>
+       <visible>false</visible>
+       <width>375</width>
+       <height>375</height>
+       <content>
+        <![CDATA[<p align='center'><img src='assets/images/globe.png' width='140' height='140' /></p>
+        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer for Flex</font></a>
+        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API for Flex</font></a>
+        <br><a href="http://www.esri.com" target='_blank'><font color='#FFFF00'>Esri</font></a></p></textformat>
+        ]]>
+        </content>
+        <!-- <btnlabel>확인</btnlabel> -->
+    </about>
+</configuration>
+<!--
+    See HeaderController widget documentation at
+    http://links.esri.com/headercontrollerwidget
+-->
diff --git a/src/apps/ko_KR/config.xml b/src/apps/ko_KR/config.xml
new file mode 100755
index 0000000..099d609
--- /dev/null
+++ b/src/apps/ko_KR/config.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+////////////////////////////////////////////////////////////////////////////
+//
+// Read more about ArcGIS Viewer for Flex - http://links.esri.com/flexviewer
+//
+////////////////////////////////////////////////////////////////////////////
+-->
+<configuration>
+    <title>ArcGIS Viewer for Flex</title>
+    <logo>assets/images/logo.png</logo>
+    <style>
+        <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
+        <alpha>0.8</alpha>
+    </style>
+    <!-- replace the following url with your own geometryservice -->
+    <geometryservice url="http://tasks.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer" />
+
+    <widget left="10" top="50" config="widgets/Navigation/NavigationWidget.xml" url="widgets/Navigation/NavigationWidget.swf"/>
+    <widget right="-2" bottom="-2" config="widgets/OverviewMap/OverviewMapWidget.xml" url="widgets/OverviewMap/OverviewMapWidget.swf"/>
+    <widget right="20" top="55" config="widgets/MapSwitcher/MapSwitcherWidget.xml" url="widgets/MapSwitcher/MapSwitcherWidget.swf"/>
+    <widget left="0" top="0" config="apps/ko_KR/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
+    <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
+
+    <map initialextent="13879000 3892000 14599900 4702000" top="40" wraparound180="true" addarcgisbasemaps="true">
+        <operationallayers>
+            <layer label="인구 통계" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
+                <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
+                <sublayer id="2" popupconfig="popups/PopUp_Demographics_Tracts.xml"/>
+                <sublayer id="3" popupconfig="popups/PopUp_Demographics_Counties.xml"/>
+                <sublayer id="4" popupconfig="popups/PopUp_Demographics_States.xml"/>
+            </layer>
+            <layer label="경계 및 위치" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places_Alternate/MapServer"/>
+            <layer label="화재" type="feature" visible="false" alpha="1.0" popupconfig="popups/PopUp_Fires.xml" url="http://sampleserver3.arcgisonline.com/ArcGIS/rest/services/Fire/Sheep/FeatureServer/0"/>
+        </operationallayers>
+    </map>
+
+    <widgetcontainer layout="float">
+        <widget label="책갈피" icon="assets/images/i_bookmark.png" config="apps/ko_KR/BookmarkWidget.xml" url="widgets/Bookmark/BookmarkWidget.swf"/>
+        <widget label="주소 찾기" icon="assets/images/i_pin2.png" config="widgets/Locate/LocateWidget_EU.xml" url="widgets/Locate/LocateWidget.swf"/>
+        <widget label="루이빌 경찰" icon="assets/images/i_policestation.png" config="widgets/Query/QueryWidget_Louisville_PoliceStations.xml" url="widgets/Query/QueryWidget.swf"/>
+        <widget label="검색" icon="assets/images/i_search.png" config="widgets/Search/SearchWidget_Louisville.xml" url="widgets/Search/SearchWidget.swf"/>
+        <widget label="지진" icon="assets/images/i_rss.png" config="widgets/GeoRSS/GeoRSSWidget.xml" url="widgets/GeoRSS/GeoRSSWidget.swf"/>
+        <widget label="그리기 및 측정" icon="assets/images/i_draw2.png" config="widgets/Draw/DrawWidget.xml" url="widgets/Draw/DrawWidget.swf"/>
+        <widget label="인쇄" icon="assets/images/i_print.png" config="widgets/Print/PrintWidget.xml" url="widgets/Print/PrintWidget.swf"/>
+    </widgetcontainer>
+
+</configuration>
diff --git a/src/apps/nb_NO/BookmarkWidget.xml b/src/apps/nb_NO/BookmarkWidget.xml
new file mode 100755
index 0000000..992ffc8
--- /dev/null
+++ b/src/apps/nb_NO/BookmarkWidget.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<configuration label="Bookmarks (example)">
+    <bookmarks>
+        <bookmark name="Contiguous USA">-13934000 2699500 -8034300 6710900</bookmark>
+        <bookmark name="San Francisco">-13638000 4541000 -13632000 4551000</bookmark>
+        <bookmark name="Louisville, Kentucky">-9559973 4601704 -9529513 4621654</bookmark>
+        <bookmark name="Los Angeles">-13211400 3993400 -13119200 4056100</bookmark>
+        <bookmark name="Japan">13917200 3452300 16908700 5477600</bookmark>
+        <bookmark name="Lisbon">-1039800 4665500 -993700 4696800</bookmark>
+        <bookmark name="Chile">-8732266 -8111526 -6810170 -1859588</bookmark>
+    </bookmarks>
+</configuration>
+
+<!--
+    See Bookmark widget tag reference at
+    http://links.esri.com/bookmarkwidget
+-->
diff --git a/src/apps/nb_NO/HeaderControllerWidget.xml b/src/apps/nb_NO/HeaderControllerWidget.xml
new file mode 100755
index 0000000..22d1cfa
--- /dev/null
+++ b/src/apps/nb_NO/HeaderControllerWidget.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<configuration>
+    <about>
+       <label>Om</label>
+       <visible>false</visible>
+       <width>375</width>
+       <height>375</height>
+       <content>
+        <![CDATA[<p align='center'><img src='assets/images/globe.png' width='140' height='140' /></p>
+        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer for Flex</font></a>
+        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API for Flex</font></a>
+        <br><a href="http://www.esri.com" target='_blank'><font color='#FFFF00'>Esri</font></a></p></textformat>
+        ]]>
+        </content>
+        <!-- <btnlabel>OK</btnlabel> -->
+    </about>
+</configuration>
+<!--
+    See HeaderController widget documentation at
+    http://links.esri.com/headercontrollerwidget
+-->
diff --git a/src/apps/nb_NO/config.xml b/src/apps/nb_NO/config.xml
new file mode 100755
index 0000000..b834064
--- /dev/null
+++ b/src/apps/nb_NO/config.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+////////////////////////////////////////////////////////////////////////////
+//
+// Read more about ArcGIS Viewer for Flex - http://links.esri.com/flexviewer
+//
+////////////////////////////////////////////////////////////////////////////
+-->
+<configuration>
+    <title>ArcGIS Viewer for Flex</title>
+    <logo>assets/images/logo.png</logo>
+    <style>
+        <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
+        <alpha>0.8</alpha>
+    </style>
+    <!-- replace the following url with your own geometryservice -->
+    <geometryservice url="http://tasks.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer" />
+
+    <widget left="10" top="50" config="widgets/Navigation/NavigationWidget.xml" url="widgets/Navigation/NavigationWidget.swf"/>
+    <widget right="-2" bottom="-2" config="widgets/OverviewMap/OverviewMapWidget.xml" url="widgets/OverviewMap/OverviewMapWidget.swf"/>
+    <widget right="20" top="55" config="widgets/MapSwitcher/MapSwitcherWidget.xml" url="widgets/MapSwitcher/MapSwitcherWidget.swf"/>
+    <widget left="0" top="0" config="apps/nb_NO/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
+    <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
+
+    <map initialextent="-1077000 7934000 2653000 16189000" top="40" wraparound180="true" addarcgisbasemaps="true">
+        <operationallayers>
+            <layer label="Demografi" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
+                <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
+                <sublayer id="2" popupconfig="popups/PopUp_Demographics_Tracts.xml"/>
+                <sublayer id="3" popupconfig="popups/PopUp_Demographics_Counties.xml"/>
+                <sublayer id="4" popupconfig="popups/PopUp_Demographics_States.xml"/>
+            </layer>
+            <layer label="Grenselinjer og steder" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places_Alternate/MapServer"/>
+            <layer label="Branner" type="feature" visible="false" alpha="1.0" popupconfig="popups/PopUp_Fires.xml" url="http://sampleserver3.arcgisonline.com/ArcGIS/rest/services/Fire/Sheep/FeatureServer/0"/>
+        </operationallayers>
+    </map>
+
+    <widgetcontainer layout="float">
+        <widget label="Bokmerker" icon="assets/images/i_bookmark.png" config="apps/nb_NO/BookmarkWidget.xml" url="widgets/Bookmark/BookmarkWidget.swf"/>
+        <widget label="Finn en adresse" icon="assets/images/i_pin2.png" config="widgets/Locate/LocateWidget_EU.xml" url="widgets/Locate/LocateWidget.swf"/>
+        <widget label="Louisville politi" icon="assets/images/i_policestation.png" config="widgets/Query/QueryWidget_Louisville_PoliceStations.xml" url="widgets/Query/QueryWidget.swf"/>
+        <widget label="Søk" icon="assets/images/i_search.png" config="widgets/Search/SearchWidget_Louisville.xml" url="widgets/Search/SearchWidget.swf"/>
+        <widget label="Jordskjelv" icon="assets/images/i_rss.png" config="widgets/GeoRSS/GeoRSSWidget.xml" url="widgets/GeoRSS/GeoRSSWidget.swf"/>
+        <widget label="Tegn og mål" icon="assets/images/i_draw2.png" config="widgets/Draw/DrawWidget.xml" url="widgets/Draw/DrawWidget.swf"/>
+        <widget label="Skriv ut" icon="assets/images/i_print.png" config="widgets/Print/PrintWidget.xml" url="widgets/Print/PrintWidget.swf"/>
+    </widgetcontainer>
+
+</configuration>
diff --git a/src/apps/nl_NL/BookmarkWidget.xml b/src/apps/nl_NL/BookmarkWidget.xml
new file mode 100755
index 0000000..992ffc8
--- /dev/null
+++ b/src/apps/nl_NL/BookmarkWidget.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<configuration label="Bookmarks (example)">
+    <bookmarks>
+        <bookmark name="Contiguous USA">-13934000 2699500 -8034300 6710900</bookmark>
+        <bookmark name="San Francisco">-13638000 4541000 -13632000 4551000</bookmark>
+        <bookmark name="Louisville, Kentucky">-9559973 4601704 -9529513 4621654</bookmark>
+        <bookmark name="Los Angeles">-13211400 3993400 -13119200 4056100</bookmark>
+        <bookmark name="Japan">13917200 3452300 16908700 5477600</bookmark>
+        <bookmark name="Lisbon">-1039800 4665500 -993700 4696800</bookmark>
+        <bookmark name="Chile">-8732266 -8111526 -6810170 -1859588</bookmark>
+    </bookmarks>
+</configuration>
+
+<!--
+    See Bookmark widget tag reference at
+    http://links.esri.com/bookmarkwidget
+-->
diff --git a/src/apps/nl_NL/HeaderControllerWidget.xml b/src/apps/nl_NL/HeaderControllerWidget.xml
new file mode 100755
index 0000000..ada1744
--- /dev/null
+++ b/src/apps/nl_NL/HeaderControllerWidget.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<configuration>
+    <about>
+       <label>Informatie</label>
+       <visible>false</visible>
+       <width>375</width>
+       <height>375</height>
+       <content>
+        <![CDATA[<p align='center'><img src='assets/images/globe.png' width='140' height='140' /></p>
+        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer for Flex</font></a>
+        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API for Flex</font></a>
+        <br><a href="http://www.esri.com" target='_blank'><font color='#FFFF00'>Esri</font></a></p></textformat>
+        ]]>
+        </content>
+        <!-- <btnlabel>OK</btnlabel> -->
+    </about>
+</configuration>
+<!--
+    See HeaderController widget documentation at
+    http://links.esri.com/headercontrollerwidget
+-->
diff --git a/src/apps/nl_NL/config.xml b/src/apps/nl_NL/config.xml
new file mode 100755
index 0000000..83aeed1
--- /dev/null
+++ b/src/apps/nl_NL/config.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+////////////////////////////////////////////////////////////////////////////
+//
+// Read more about ArcGIS Viewer for Flex - http://links.esri.com/flexviewer
+//
+////////////////////////////////////////////////////////////////////////////
+-->
+<configuration>
+    <title>ArcGIS Viewer for Flex</title>
+    <logo>assets/images/logo.png</logo>
+    <style>
+        <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
+        <alpha>0.8</alpha>
+    </style>
+    <!-- replace the following url with your own geometryservice -->
+    <geometryservice url="http://tasks.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer" />
+
+    <widget left="10" top="50" config="widgets/Navigation/NavigationWidget.xml" url="widgets/Navigation/NavigationWidget.swf"/>
+    <widget right="-2" bottom="-2" config="widgets/OverviewMap/OverviewMapWidget.xml" url="widgets/OverviewMap/OverviewMapWidget.swf"/>
+    <widget right="20" top="55" config="widgets/MapSwitcher/MapSwitcherWidget.xml" url="widgets/MapSwitcher/MapSwitcherWidget.swf"/>
+    <widget left="0" top="0" config="apps/nl_NL/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
+    <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
+
+    <map initialextent="361000 6565000 827000 7122000" top="40" wraparound180="true" addarcgisbasemaps="true">
+        <operationallayers>
+            <layer label="Demografische gegevens" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
+                <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
+                <sublayer id="2" popupconfig="popups/PopUp_Demographics_Tracts.xml"/>
+                <sublayer id="3" popupconfig="popups/PopUp_Demographics_Counties.xml"/>
+                <sublayer id="4" popupconfig="popups/PopUp_Demographics_States.xml"/>
+            </layer>
+            <layer label="Grenzen en plaatsen" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places_Alternate/MapServer"/>
+            <layer label="Branden" type="feature" visible="false" alpha="1.0" popupconfig="popups/PopUp_Fires.xml" url="http://sampleserver3.arcgisonline.com/ArcGIS/rest/services/Fire/Sheep/FeatureServer/0"/>
+        </operationallayers>
+    </map>
+
+    <widgetcontainer layout="float">
+        <widget label="Bladwijzers" icon="assets/images/i_bookmark.png" config="apps/nl_NL/BookmarkWidget.xml" url="widgets/Bookmark/BookmarkWidget.swf"/>
+        <widget label="Een adres zoeken" icon="assets/images/i_pin2.png" config="widgets/Locate/LocateWidget_EU.xml" url="widgets/Locate/LocateWidget.swf"/>
+        <widget label="Politie van Louisville" icon="assets/images/i_policestation.png" config="widgets/Query/QueryWidget_Louisville_PoliceStations.xml" url="widgets/Query/QueryWidget.swf"/>
+        <widget label="Zoeken" icon="assets/images/i_search.png" config="widgets/Search/SearchWidget_Louisville.xml" url="widgets/Search/SearchWidget.swf"/>
+        <widget label="Aardbevingen" icon="assets/images/i_rss.png" config="widgets/GeoRSS/GeoRSSWidget.xml" url="widgets/GeoRSS/GeoRSSWidget.swf"/>
+        <widget label="Tekenen en meten" icon="assets/images/i_draw2.png" config="widgets/Draw/DrawWidget.xml" url="widgets/Draw/DrawWidget.swf"/>
+        <widget label="Afdrukken" icon="assets/images/i_print.png" config="widgets/Print/PrintWidget.xml" url="widgets/Print/PrintWidget.swf"/>
+    </widgetcontainer>
+
+</configuration>
diff --git a/src/apps/pl_PL/BookmarkWidget.xml b/src/apps/pl_PL/BookmarkWidget.xml
new file mode 100755
index 0000000..992ffc8
--- /dev/null
+++ b/src/apps/pl_PL/BookmarkWidget.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<configuration label="Bookmarks (example)">
+    <bookmarks>
+        <bookmark name="Contiguous USA">-13934000 2699500 -8034300 6710900</bookmark>
+        <bookmark name="San Francisco">-13638000 4541000 -13632000 4551000</bookmark>
+        <bookmark name="Louisville, Kentucky">-9559973 4601704 -9529513 4621654</bookmark>
+        <bookmark name="Los Angeles">-13211400 3993400 -13119200 4056100</bookmark>
+        <bookmark name="Japan">13917200 3452300 16908700 5477600</bookmark>
+        <bookmark name="Lisbon">-1039800 4665500 -993700 4696800</bookmark>
+        <bookmark name="Chile">-8732266 -8111526 -6810170 -1859588</bookmark>
+    </bookmarks>
+</configuration>
+
+<!--
+    See Bookmark widget tag reference at
+    http://links.esri.com/bookmarkwidget
+-->
diff --git a/src/apps/pl_PL/HeaderControllerWidget.xml b/src/apps/pl_PL/HeaderControllerWidget.xml
new file mode 100755
index 0000000..7ac9e26
--- /dev/null
+++ b/src/apps/pl_PL/HeaderControllerWidget.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<configuration>
+    <about>
+       <label>Informacje</label>
+       <visible>false</visible>
+       <width>375</width>
+       <height>375</height>
+       <content>
+        <![CDATA[<p align='center'><img src='assets/images/globe.png' width='140' height='140' /></p>
+        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer for Flex</font></a>
+        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API for Flex</font></a>
+        <br><a href="http://www.esri.com" target='_blank'><font color='#FFFF00'>Esri</font></a></p></textformat>
+        ]]>
+        </content>
+        <!-- <btnlabel>OK</btnlabel> -->
+    </about>
+</configuration>
+<!--
+    See HeaderController widget documentation at
+    http://links.esri.com/headercontrollerwidget
+-->
diff --git a/src/apps/pl_PL/config.xml b/src/apps/pl_PL/config.xml
new file mode 100755
index 0000000..caaa8b4
--- /dev/null
+++ b/src/apps/pl_PL/config.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+////////////////////////////////////////////////////////////////////////////
+//
+// Read more about ArcGIS Viewer for Flex - http://links.esri.com/flexviewer
+//
+////////////////////////////////////////////////////////////////////////////
+-->
+<configuration>
+    <title>ArcGIS Viewer for Flex</title>
+    <logo>assets/images/logo.png</logo>
+    <style>
+        <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
+        <alpha>0.8</alpha>
+    </style>
+    <!-- replace the following url with your own geometryservice -->
+    <geometryservice url="http://tasks.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer" />
+
+    <widget left="10" top="50" config="widgets/Navigation/NavigationWidget.xml" url="widgets/Navigation/NavigationWidget.swf"/>
+    <widget right="-2" bottom="-2" config="widgets/OverviewMap/OverviewMapWidget.xml" url="widgets/OverviewMap/OverviewMapWidget.swf"/>
+    <widget right="20" top="55" config="widgets/MapSwitcher/MapSwitcherWidget.xml" url="widgets/MapSwitcher/MapSwitcherWidget.swf"/>
+    <widget left="0" top="0" config="apps/pl_PL/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
+    <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
+
+    <map initialextent="1477000 6236000 2878000 7373000" top="40" wraparound180="true" addarcgisbasemaps="true">
+        <operationallayers>
+            <layer label="Demografia" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
+                <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
+                <sublayer id="2" popupconfig="popups/PopUp_Demographics_Tracts.xml"/>
+                <sublayer id="3" popupconfig="popups/PopUp_Demographics_Counties.xml"/>
+                <sublayer id="4" popupconfig="popups/PopUp_Demographics_States.xml"/>
+            </layer>
+            <layer label="Granice i miejsca" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places_Alternate/MapServer"/>
+            <layer label="Pożary" type="feature" visible="false" alpha="1.0" popupconfig="popups/PopUp_Fires.xml" url="http://sampleserver3.arcgisonline.com/ArcGIS/rest/services/Fire/Sheep/FeatureServer/0"/>
+        </operationallayers>
+    </map>
+
+    <widgetcontainer layout="float">
+        <widget label="Zakładki" icon="assets/images/i_bookmark.png" config="apps/pl_PL/BookmarkWidget.xml" url="widgets/Bookmark/BookmarkWidget.swf"/>
+        <widget label="Znajdź adres" icon="assets/images/i_pin2.png" config="widgets/Locate/LocateWidget_EU.xml" url="widgets/Locate/LocateWidget.swf"/>
+        <widget label="Wydział policyjny z Louisville" icon="assets/images/i_policestation.png" config="widgets/Query/QueryWidget_Louisville_PoliceStations.xml" url="widgets/Query/QueryWidget.swf"/>
+        <widget label="Wyszukaj" icon="assets/images/i_search.png" config="widgets/Search/SearchWidget_Louisville.xml" url="widgets/Search/SearchWidget.swf"/>
+        <widget label="Trzęsienia ziemi" icon="assets/images/i_rss.png" config="widgets/GeoRSS/GeoRSSWidget.xml" url="widgets/GeoRSS/GeoRSSWidget.swf"/>
+        <widget label="Narysuj i zmierz" icon="assets/images/i_draw2.png" config="widgets/Draw/DrawWidget.xml" url="widgets/Draw/DrawWidget.swf"/>
+        <widget label="Drukuj" icon="assets/images/i_print.png" config="widgets/Print/PrintWidget.xml" url="widgets/Print/PrintWidget.swf"/>
+    </widgetcontainer>
+
+</configuration>
diff --git a/src/apps/pt_BR/HeaderControllerWidget.xml b/src/apps/pt_BR/HeaderControllerWidget.xml
old mode 100644
new mode 100755
index 9e53152..ff46892
--- a/src/apps/pt_BR/HeaderControllerWidget.xml
+++ b/src/apps/pt_BR/HeaderControllerWidget.xml
@@ -7,8 +7,8 @@
        <height>375</height>
        <content>
         <![CDATA[<p align='center'><img src='assets/images/globe.png' width='140' height='140' /></p>
-        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer para Flex</font></a>
-        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API para Flex</font></a>
+        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer for Flex</font></a>
+        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API for Flex</font></a>
         <br><a href="http://www.esri.com" target='_blank'><font color='#FFFF00'>Esri</font></a></p></textformat>
         ]]>
         </content>
diff --git a/src/apps/pt_BR/config.xml b/src/apps/pt_BR/config.xml
old mode 100644
new mode 100755
index b5d59b1..cbe07e2
--- a/src/apps/pt_BR/config.xml
+++ b/src/apps/pt_BR/config.xml
@@ -7,8 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////
 -->
 <configuration>
-    <title>Sobre o ArcGIS Viewer para Flex...</title>
-    <logo>assets/images/br.png</logo>
+    <title>ArcGIS Viewer for Flex</title>
+    <logo>assets/images/logo.png</logo>
     <style>
         <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
         <alpha>0.8</alpha>
@@ -22,12 +22,7 @@
     <widget left="0" top="0" config="apps/pt_BR/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
     <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
 
-    <map initialextent="-8275000 -4055000 -3256000 670000" top="40" wraparound180="true">
-        <basemaps>
-            <layer label="Ruas" type="tiled" visible="true" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"/>
-            <layer label="Aérea" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"/>
-            <layer label="Topo" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"/>
-        </basemaps>
+    <map initialextent="-8275000 -4055000 -3256000 670000" top="40" wraparound180="true" addarcgisbasemaps="true">
         <operationallayers>
             <layer label="Demográficos" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
                 <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
@@ -41,12 +36,12 @@
     </map>
 
     <widgetcontainer layout="float">
-        <widget label="Marcações" icon="assets/images/i_bookmark.png" config="widgets/Bookmark/BookmarkWidget.xml" url="widgets/Bookmark/BookmarkWidget.swf"/>
-        <widget label="Encontrar um endereço" icon="assets/images/i_pin2.png" config="widgets/Locate/LocateWidget_EU.xml" url="widgets/Locate/LocateWidget.swf"/>
+        <widget label="Marcadores" icon="assets/images/i_bookmark.png" config="widgets/Bookmark/BookmarkWidget.xml" url="widgets/Bookmark/BookmarkWidget.swf"/>
+        <widget label="Localizar endereço" icon="assets/images/i_pin2.png" config="widgets/Locate/LocateWidget_EU.xml" url="widgets/Locate/LocateWidget.swf"/>
         <widget label="Polícia de Louisville" icon="assets/images/i_policestation.png" config="widgets/Query/QueryWidget_Louisville_PoliceStations.xml" url="widgets/Query/QueryWidget.swf"/>
         <widget label="Pesquisar" icon="assets/images/i_search.png" config="widgets/Search/SearchWidget_Louisville.xml" url="widgets/Search/SearchWidget.swf"/>
         <widget label="Terremotos" icon="assets/images/i_rss.png" config="widgets/GeoRSS/GeoRSSWidget.xml" url="widgets/GeoRSS/GeoRSSWidget.swf"/>
-        <widget label="Desenhe e Meça" icon="assets/images/i_draw2.png" config="widgets/Draw/DrawWidget.xml" url="widgets/Draw/DrawWidget.swf"/>
+        <widget label="Desenhar e Medir" icon="assets/images/i_draw2.png" config="widgets/Draw/DrawWidget.xml" url="widgets/Draw/DrawWidget.swf"/>
         <widget label="Imprimir" icon="assets/images/i_print.png" config="widgets/Print/PrintWidget.xml" url="widgets/Print/PrintWidget.swf"/>
     </widgetcontainer>
 
diff --git a/src/apps/ro_RO/BookmarkWidget.xml b/src/apps/ro_RO/BookmarkWidget.xml
new file mode 100755
index 0000000..992ffc8
--- /dev/null
+++ b/src/apps/ro_RO/BookmarkWidget.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<configuration label="Bookmarks (example)">
+    <bookmarks>
+        <bookmark name="Contiguous USA">-13934000 2699500 -8034300 6710900</bookmark>
+        <bookmark name="San Francisco">-13638000 4541000 -13632000 4551000</bookmark>
+        <bookmark name="Louisville, Kentucky">-9559973 4601704 -9529513 4621654</bookmark>
+        <bookmark name="Los Angeles">-13211400 3993400 -13119200 4056100</bookmark>
+        <bookmark name="Japan">13917200 3452300 16908700 5477600</bookmark>
+        <bookmark name="Lisbon">-1039800 4665500 -993700 4696800</bookmark>
+        <bookmark name="Chile">-8732266 -8111526 -6810170 -1859588</bookmark>
+    </bookmarks>
+</configuration>
+
+<!--
+    See Bookmark widget tag reference at
+    http://links.esri.com/bookmarkwidget
+-->
diff --git a/src/apps/ro_RO/HeaderControllerWidget.xml b/src/apps/ro_RO/HeaderControllerWidget.xml
new file mode 100755
index 0000000..8fdfdaf
--- /dev/null
+++ b/src/apps/ro_RO/HeaderControllerWidget.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<configuration>
+    <about>
+       <label>Despre</label>
+       <visible>false</visible>
+       <width>375</width>
+       <height>375</height>
+       <content>
+        <![CDATA[<p align='center'><img src='assets/images/globe.png' width='140' height='140' /></p>
+        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer for Flex</font></a>
+        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API for Flex</font></a>
+        <br><a href="http://www.esri.com" target='_blank'><font color='#FFFF00'>Esri</font></a></p></textformat>
+        ]]>
+        </content>
+        <!-- <btnlabel>OK</btnlabel> -->
+    </about>
+</configuration>
+<!--
+    See HeaderController widget documentation at
+    http://links.esri.com/headercontrollerwidget
+-->
diff --git a/src/apps/ro_RO/config.xml b/src/apps/ro_RO/config.xml
new file mode 100755
index 0000000..ddf44ca
--- /dev/null
+++ b/src/apps/ro_RO/config.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+////////////////////////////////////////////////////////////////////////////
+//
+// Read more about ArcGIS Viewer for Flex - http://links.esri.com/flexviewer
+//
+////////////////////////////////////////////////////////////////////////////
+-->
+<configuration>
+    <title>ArcGIS Viewer for Flex</title>
+    <logo>assets/images/logo.png</logo>
+    <style>
+        <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
+        <alpha>0.8</alpha>
+    </style>
+    <!-- replace the following url with your own geometryservice -->
+    <geometryservice url="http://tasks.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer" />
+
+    <widget left="10" top="50" config="widgets/Navigation/NavigationWidget.xml" url="widgets/Navigation/NavigationWidget.swf"/>
+    <widget right="-2" bottom="-2" config="widgets/OverviewMap/OverviewMapWidget.xml" url="widgets/OverviewMap/OverviewMapWidget.swf"/>
+    <widget right="20" top="55" config="widgets/MapSwitcher/MapSwitcherWidget.xml" url="widgets/MapSwitcher/MapSwitcherWidget.swf"/>
+    <widget left="0" top="0" config="apps/ro_RO/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
+    <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
+
+    <map initialextent="2185000 5382000 3443000 6214000" top="40" wraparound180="true" addarcgisbasemaps="true">
+        <operationallayers>
+            <layer label="Demografie" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
+                <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
+                <sublayer id="2" popupconfig="popups/PopUp_Demographics_Tracts.xml"/>
+                <sublayer id="3" popupconfig="popups/PopUp_Demographics_Counties.xml"/>
+                <sublayer id="4" popupconfig="popups/PopUp_Demographics_States.xml"/>
+            </layer>
+            <layer label="Graniţe şi locuri" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places_Alternate/MapServer"/>
+            <layer label="Incendii" type="feature" visible="false" alpha="1.0" popupconfig="popups/PopUp_Fires.xml" url="http://sampleserver3.arcgisonline.com/ArcGIS/rest/services/Fire/Sheep/FeatureServer/0"/>
+        </operationallayers>
+    </map>
+
+    <widgetcontainer layout="float">
+        <widget label="Semne de carte" icon="assets/images/i_bookmark.png" config="apps/ro_RO/BookmarkWidget.xml" url="widgets/Bookmark/BookmarkWidget.swf"/>
+        <widget label="Găsire adresă" icon="assets/images/i_pin2.png" config="widgets/Locate/LocateWidget_EU.xml" url="widgets/Locate/LocateWidget.swf"/>
+        <widget label="Poliţia din Louisville" icon="assets/images/i_policestation.png" config="widgets/Query/QueryWidget_Louisville_PoliceStations.xml" url="widgets/Query/QueryWidget.swf"/>
+        <widget label="Căutare" icon="assets/images/i_search.png" config="widgets/Search/SearchWidget_Louisville.xml" url="widgets/Search/SearchWidget.swf"/>
+        <widget label="Cutremure" icon="assets/images/i_rss.png" config="widgets/GeoRSS/GeoRSSWidget.xml" url="widgets/GeoRSS/GeoRSSWidget.swf"/>
+        <widget label="Trasare şi măsurare" icon="assets/images/i_draw2.png" config="widgets/Draw/DrawWidget.xml" url="widgets/Draw/DrawWidget.swf"/>
+        <widget label="Imprimare" icon="assets/images/i_print.png" config="widgets/Print/PrintWidget.xml" url="widgets/Print/PrintWidget.swf"/>
+    </widgetcontainer>
+
+</configuration>
diff --git a/src/apps/ru_RU/HeaderControllerWidget.xml b/src/apps/ru_RU/HeaderControllerWidget.xml
old mode 100644
new mode 100755
index e01fc87..933cf38
--- a/src/apps/ru_RU/HeaderControllerWidget.xml
+++ b/src/apps/ru_RU/HeaderControllerWidget.xml
@@ -7,8 +7,8 @@
        <height>375</height>
        <content>
         <![CDATA[<p align='center'><img src='assets/images/globe.png' width='140' height='140' /></p>
-        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer для Flex</font></a>
-        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API для Flex</font></a>
+        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer for Flex</font></a>
+        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API for Flex</font></a>
         <br><a href="http://www.esri.com" target='_blank'><font color='#FFFF00'>Esri</font></a></p></textformat>
         ]]>
         </content>
diff --git a/src/apps/ru_RU/config.xml b/src/apps/ru_RU/config.xml
old mode 100644
new mode 100755
index d821c7a..7252885
--- a/src/apps/ru_RU/config.xml
+++ b/src/apps/ru_RU/config.xml
@@ -7,8 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////
 -->
 <configuration>
-    <title>О программе ArcGIS Viewer для Flex...</title>
-    <logo>assets/images/ru.png</logo>
+    <title>ArcGIS Viewer for Flex</title>
+    <logo>assets/images/logo.png</logo>
     <style>
         <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
         <alpha>0.8</alpha>
@@ -22,12 +22,7 @@
     <widget left="0" top="0" config="apps/ru_RU/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
     <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
 
-    <map initialextent="1868000 4713000 21553000 12795000" top="40" wraparound180="true">
-        <basemaps>
-            <layer label="Улицы" type="tiled" visible="true" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"/>
-            <layer label="Снимки" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"/>
-            <layer label="Топография" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"/>
-        </basemaps>
+    <map initialextent="1868000 4713000 21553000 12795000" top="40" wraparound180="true" addarcgisbasemaps="true">
         <operationallayers>
             <layer label="Демографические данные" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
                 <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
@@ -35,7 +30,7 @@
                 <sublayer id="3" popupconfig="popups/PopUp_Demographics_Counties.xml"/>
                 <sublayer id="4" popupconfig="popups/PopUp_Demographics_States.xml"/>
             </layer>
-            <layer label="Границы и места" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places_Alternate/MapServer"/>
+            <layer label="Границы и местоположения" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places_Alternate/MapServer"/>
             <layer label="Пожары" type="feature" visible="false" alpha="1.0" popupconfig="popups/PopUp_Fires.xml" url="http://sampleserver3.arcgisonline.com/ArcGIS/rest/services/Fire/Sheep/FeatureServer/0"/>
         </operationallayers>
     </map>
@@ -46,7 +41,7 @@
         <widget label="Полиция Луисвилла" icon="assets/images/i_policestation.png" config="widgets/Query/QueryWidget_Louisville_PoliceStations.xml" url="widgets/Query/QueryWidget.swf"/>
         <widget label="Поиск" icon="assets/images/i_search.png" config="widgets/Search/SearchWidget_Louisville.xml" url="widgets/Search/SearchWidget.swf"/>
         <widget label="Землетрясения" icon="assets/images/i_rss.png" config="widgets/GeoRSS/GeoRSSWidget.xml" url="widgets/GeoRSS/GeoRSSWidget.swf"/>
-        <widget label="Создать и измерить" icon="assets/images/i_draw2.png" config="widgets/Draw/DrawWidget.xml" url="widgets/Draw/DrawWidget.swf"/>
+        <widget label="Нарисовать и измерить" icon="assets/images/i_draw2.png" config="widgets/Draw/DrawWidget.xml" url="widgets/Draw/DrawWidget.swf"/>
         <widget label="Печать" icon="assets/images/i_print.png" config="widgets/Print/PrintWidget.xml" url="widgets/Print/PrintWidget.swf"/>
     </widgetcontainer>
 
diff --git a/src/apps/sv_SE/BookmarkWidget.xml b/src/apps/sv_SE/BookmarkWidget.xml
new file mode 100755
index 0000000..992ffc8
--- /dev/null
+++ b/src/apps/sv_SE/BookmarkWidget.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<configuration label="Bookmarks (example)">
+    <bookmarks>
+        <bookmark name="Contiguous USA">-13934000 2699500 -8034300 6710900</bookmark>
+        <bookmark name="San Francisco">-13638000 4541000 -13632000 4551000</bookmark>
+        <bookmark name="Louisville, Kentucky">-9559973 4601704 -9529513 4621654</bookmark>
+        <bookmark name="Los Angeles">-13211400 3993400 -13119200 4056100</bookmark>
+        <bookmark name="Japan">13917200 3452300 16908700 5477600</bookmark>
+        <bookmark name="Lisbon">-1039800 4665500 -993700 4696800</bookmark>
+        <bookmark name="Chile">-8732266 -8111526 -6810170 -1859588</bookmark>
+    </bookmarks>
+</configuration>
+
+<!--
+    See Bookmark widget tag reference at
+    http://links.esri.com/bookmarkwidget
+-->
diff --git a/src/apps/sv_SE/HeaderControllerWidget.xml b/src/apps/sv_SE/HeaderControllerWidget.xml
new file mode 100755
index 0000000..22d1cfa
--- /dev/null
+++ b/src/apps/sv_SE/HeaderControllerWidget.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<configuration>
+    <about>
+       <label>Om</label>
+       <visible>false</visible>
+       <width>375</width>
+       <height>375</height>
+       <content>
+        <![CDATA[<p align='center'><img src='assets/images/globe.png' width='140' height='140' /></p>
+        <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer for Flex</font></a>
+        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API for Flex</font></a>
+        <br><a href="http://www.esri.com" target='_blank'><font color='#FFFF00'>Esri</font></a></p></textformat>
+        ]]>
+        </content>
+        <!-- <btnlabel>OK</btnlabel> -->
+    </about>
+</configuration>
+<!--
+    See HeaderController widget documentation at
+    http://links.esri.com/headercontrollerwidget
+-->
diff --git a/src/apps/sv_SE/config.xml b/src/apps/sv_SE/config.xml
new file mode 100755
index 0000000..b808268
--- /dev/null
+++ b/src/apps/sv_SE/config.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+////////////////////////////////////////////////////////////////////////////
+//
+// Read more about ArcGIS Viewer for Flex - http://links.esri.com/flexviewer
+//
+////////////////////////////////////////////////////////////////////////////
+-->
+<configuration>
+    <title>ArcGIS Viewer for Flex</title>
+    <logo>assets/images/logo.png</logo>
+    <style>
+        <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
+        <alpha>0.8</alpha>
+    </style>
+    <!-- replace the following url with your own geometryservice -->
+    <geometryservice url="http://tasks.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer" />
+
+    <widget left="10" top="50" config="widgets/Navigation/NavigationWidget.xml" url="widgets/Navigation/NavigationWidget.swf"/>
+    <widget right="-2" bottom="-2" config="widgets/OverviewMap/OverviewMapWidget.xml" url="widgets/OverviewMap/OverviewMapWidget.swf"/>
+    <widget right="20" top="55" config="widgets/MapSwitcher/MapSwitcherWidget.xml" url="widgets/MapSwitcher/MapSwitcherWidget.swf"/>
+    <widget left="0" top="0" config="apps/sv_SE/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
+    <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
+
+    <map initialextent="1054000 7351000 2849000 11519000" top="40" wraparound180="true" addarcgisbasemaps="true">
+        <operationallayers>
+            <layer label="Demografi" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
+                <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
+                <sublayer id="2" popupconfig="popups/PopUp_Demographics_Tracts.xml"/>
+                <sublayer id="3" popupconfig="popups/PopUp_Demographics_Counties.xml"/>
+                <sublayer id="4" popupconfig="popups/PopUp_Demographics_States.xml"/>
+            </layer>
+            <layer label="Gränser och platser" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places_Alternate/MapServer"/>
+            <layer label="Bränder" type="feature" visible="false" alpha="1.0" popupconfig="popups/PopUp_Fires.xml" url="http://sampleserver3.arcgisonline.com/ArcGIS/rest/services/Fire/Sheep/FeatureServer/0"/>
+        </operationallayers>
+    </map>
+
+    <widgetcontainer layout="float">
+        <widget label="Bokmärken" icon="assets/images/i_bookmark.png" config="apps/sv_SE/BookmarkWidget.xml" url="widgets/Bookmark/BookmarkWidget.swf"/>
+        <widget label="Hitta en adress" icon="assets/images/i_pin2.png" config="widgets/Locate/LocateWidget_EU.xml" url="widgets/Locate/LocateWidget.swf"/>
+        <widget label="Polisen i Louisville" icon="assets/images/i_policestation.png" config="widgets/Query/QueryWidget_Louisville_PoliceStations.xml" url="widgets/Query/QueryWidget.swf"/>
+        <widget label="Sök" icon="assets/images/i_search.png" config="widgets/Search/SearchWidget_Louisville.xml" url="widgets/Search/SearchWidget.swf"/>
+        <widget label="Jordbävningar" icon="assets/images/i_rss.png" config="widgets/GeoRSS/GeoRSSWidget.xml" url="widgets/GeoRSS/GeoRSSWidget.swf"/>
+        <widget label="Rita och mät" icon="assets/images/i_draw2.png" config="widgets/Draw/DrawWidget.xml" url="widgets/Draw/DrawWidget.swf"/>
+        <widget label="Skriv ut" icon="assets/images/i_print.png" config="widgets/Print/PrintWidget.xml" url="widgets/Print/PrintWidget.swf"/>
+    </widgetcontainer>
+
+</configuration>
diff --git a/src/apps/zh_CN/BookmarkWidget.xml b/src/apps/zh_CN/BookmarkWidget.xml
old mode 100644
new mode 100755
diff --git a/src/apps/zh_CN/CoordinateWidget.xml b/src/apps/zh_CN/CoordinateWidget.xml
old mode 100644
new mode 100755
diff --git a/src/apps/zh_CN/HeaderControllerWidget.xml b/src/apps/zh_CN/HeaderControllerWidget.xml
old mode 100644
new mode 100755
index 6f4b529..4bb5359
--- a/src/apps/zh_CN/HeaderControllerWidget.xml
+++ b/src/apps/zh_CN/HeaderControllerWidget.xml
@@ -8,7 +8,7 @@
        <content>
         <![CDATA[<p align='center'><img src='assets/images/globe.png' width='140' height='140' /></p>
         <textformat indent="25"><p><br><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color='#FFFF00'>ArcGIS Viewer for Flex</font></a>
-        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS  API for Flex</font></a>
+        <br><a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color='#FFFF00'>ArcGIS API for Flex</font></a>
         <br><a href="http://www.esri.com" target='_blank'><font color='#FFFF00'>Esri</font></a></p></textformat>
         ]]>
         </content>
diff --git a/src/apps/zh_CN/config.xml b/src/apps/zh_CN/config.xml
old mode 100644
new mode 100755
index f872533..88cb902
--- a/src/apps/zh_CN/config.xml
+++ b/src/apps/zh_CN/config.xml
@@ -7,8 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////
 -->
 <configuration>
-    <title>关于 ArcGIS Viewer for Flex...</title>
-    <logo>assets/images/cn.png</logo>
+    <title>ArcGIS Viewer for Flex</title>
+    <logo>assets/images/logo.png</logo>
     <style>
         <colors>0xFFFFFF,0x333333,0x101010,0x000000,0xFFD700</colors>
         <alpha>0.8</alpha>
@@ -23,12 +23,7 @@
     <widget left="0" top="0" config="apps/zh_CN/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
     <widget left="3" bottom="3" config="apps/zh_CN/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
 
-    <map initialextent="8044000 1489000 15226000 7271000" top="40" wraparound180="true">
-        <basemaps>
-            <layer label="街道图" type="tiled" visible="true" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"/>
-            <layer label="航空图" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"/>
-            <layer label="地形图" type="tiled" visible="false" url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"/>
-        </basemaps>
+    <map initialextent="8044000 1489000 15226000 7271000" top="40" wraparound180="true" addarcgisbasemaps="true">
         <operationallayers>
             <layer label="人口统计" type="tiled" visible="false" alpha="0.5" url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
                 <sublayer id="1" popupconfig="popups/PopUp_Demographics_BlockGroups.xml"/>
diff --git a/src/assets/images/Context_menu11.png b/src/assets/images/Context_menu11.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/EditPaste32.png b/src/assets/images/EditPaste32.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/EffectsTransparency16.png b/src/assets/images/EffectsTransparency16.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/GenericSearch32.png b/src/assets/images/GenericSearch32.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/GenericSpatialFile16.png b/src/assets/images/GenericSpatialFile16.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/GeoprocessingTool16.png b/src/assets/images/GeoprocessingTool16.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/GeoprocessingTool32.png b/src/assets/images/GeoprocessingTool32.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/GeoprocessingTool48.png b/src/assets/images/GeoprocessingTool48.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/LayerDown16.png b/src/assets/images/LayerDown16.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/LayerRemove16.png b/src/assets/images/LayerRemove16.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/LayerUp16.png b/src/assets/images/LayerUp16.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/LayerZoomTo16.png b/src/assets/images/LayerZoomTo16.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/Legend32.png b/src/assets/images/Legend32.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/Legend_SheepFire4.png b/src/assets/images/Legend_SheepFire4.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/Legend_popdensity.png b/src/assets/images/Legend_popdensity.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/Legend_unemp.png b/src/assets/images/Legend_unemp.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/Red_glow.swf b/src/assets/images/Red_glow.swf
old mode 100644
new mode 100755
diff --git a/src/assets/images/about.png b/src/assets/images/about.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/arrow_down.png b/src/assets/images/arrow_down.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/arrow_up.png b/src/assets/images/arrow_up.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/basemap_imagery.jpg b/src/assets/images/basemap_imagery.jpg
old mode 100644
new mode 100755
diff --git a/src/assets/images/basemap_imagery_with_labels.png b/src/assets/images/basemap_imagery_with_labels.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/basemap_streets.jpg b/src/assets/images/basemap_streets.jpg
old mode 100644
new mode 100755
diff --git a/src/assets/images/basemap_topographic.jpg b/src/assets/images/basemap_topographic.jpg
old mode 100644
new mode 100755
diff --git a/src/assets/images/br.png b/src/assets/images/br.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/cn.png b/src/assets/images/cn.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/cross_cursor.png b/src/assets/images/cross_cursor.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/de.png b/src/assets/images/de.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/defaultBasemapIcon.png b/src/assets/images/defaultBasemapIcon.png
old mode 100644
new mode 100755
index 8494b3d..ec71a49
Binary files a/src/assets/images/defaultBasemapIcon.png and b/src/assets/images/defaultBasemapIcon.png differ
diff --git a/src/assets/images/edit_addtoselection.png b/src/assets/images/edit_addtoselection.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_attachments.png b/src/assets/images/edit_attachments.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_attributes.png b/src/assets/images/edit_attributes.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_autocompletepolygontool.png b/src/assets/images/edit_autocompletepolygontool.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_cancel.png b/src/assets/images/edit_cancel.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_extenttool.png b/src/assets/images/edit_extenttool.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_freehandpolygontool.png b/src/assets/images/edit_freehandpolygontool.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_freehandpolylinetool.png b/src/assets/images/edit_freehandpolylinetool.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_genericdocument.png b/src/assets/images/edit_genericdocument.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_linetool.png b/src/assets/images/edit_linetool.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_markertool.png b/src/assets/images/edit_markertool.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_newselection.png b/src/assets/images/edit_newselection.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_polygontool.png b/src/assets/images/edit_polygontool.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_polylinetool.png b/src/assets/images/edit_polylinetool.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_removefromselection.png b/src/assets/images/edit_removefromselection.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/edit_submit.png b/src/assets/images/edit_submit.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/es.png b/src/assets/images/es.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/fr.png b/src/assets/images/fr.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/globe.png b/src/assets/images/globe.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/group-layer.png b/src/assets/images/group-layer.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_about.png b/src/assets/images/i_about.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_basemap.png b/src/assets/images/i_basemap.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_biomass.png b/src/assets/images/i_biomass.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_bookmark.png b/src/assets/images/i_bookmark.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_bookmark2.png b/src/assets/images/i_bookmark2.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_bookmark3.png b/src/assets/images/i_bookmark3.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_bookmark_add.png b/src/assets/images/i_bookmark_add.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_camera.png b/src/assets/images/i_camera.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_clear.png b/src/assets/images/i_clear.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_clear_search.png b/src/assets/images/i_clear_search.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_clock.png b/src/assets/images/i_clock.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_demographics.png b/src/assets/images/i_demographics.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_draw.png b/src/assets/images/i_draw.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_draw2.png b/src/assets/images/i_draw2.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_draw_circle.png b/src/assets/images/i_draw_circle.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_draw_ellipse.png b/src/assets/images/i_draw_ellipse.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_draw_freeline.png b/src/assets/images/i_draw_freeline.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_draw_freepoly.png b/src/assets/images/i_draw_freepoly.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_draw_line.png b/src/assets/images/i_draw_line.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_draw_point.png b/src/assets/images/i_draw_point.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_draw_poly.png b/src/assets/images/i_draw_poly.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_draw_rect.png b/src/assets/images/i_draw_rect.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_draw_text.png b/src/assets/images/i_draw_text.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_edit.png b/src/assets/images/i_edit.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_expand.png b/src/assets/images/i_expand.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_expand2.png b/src/assets/images/i_expand2.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_flag.png b/src/assets/images/i_flag.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_float.png b/src/assets/images/i_float.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_folder.png b/src/assets/images/i_folder.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_font_bold.png b/src/assets/images/i_font_bold.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_font_italic.png b/src/assets/images/i_font_italic.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_font_underline.png b/src/assets/images/i_font_underline.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_globe.png b/src/assets/images/i_globe.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_help.png b/src/assets/images/i_help.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_highway.png b/src/assets/images/i_highway.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_home.png b/src/assets/images/i_home.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_horizon.png b/src/assets/images/i_horizon.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_hydro.png b/src/assets/images/i_hydro.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_info.png b/src/assets/images/i_info.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_layers.png b/src/assets/images/i_layers.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_lego.png b/src/assets/images/i_lego.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_mailbox.png b/src/assets/images/i_mailbox.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_measure.png b/src/assets/images/i_measure.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_nav.png b/src/assets/images/i_nav.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_options.png b/src/assets/images/i_options.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_overview.png b/src/assets/images/i_overview.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_pan.png b/src/assets/images/i_pan.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_piechart.png b/src/assets/images/i_piechart.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_pin.png b/src/assets/images/i_pin.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_pin2.png b/src/assets/images/i_pin2.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_pin3.png b/src/assets/images/i_pin3.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_pin3_centered.png b/src/assets/images/i_pin3_centered.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_police.png b/src/assets/images/i_police.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_policestation.png b/src/assets/images/i_policestation.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_print.png b/src/assets/images/i_print.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_pushpin.png b/src/assets/images/i_pushpin.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_pushpin_centered.png b/src/assets/images/i_pushpin_centered.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_resources.png b/src/assets/images/i_resources.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_roof_point.png b/src/assets/images/i_roof_point.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_rss.png b/src/assets/images/i_rss.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_satellite.png b/src/assets/images/i_satellite.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_scissors.png b/src/assets/images/i_scissors.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_search.png b/src/assets/images/i_search.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_searchgraphical.png b/src/assets/images/i_searchgraphical.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_searchtext.png b/src/assets/images/i_searchtext.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_servicearea.png b/src/assets/images/i_servicearea.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_shuttle.png b/src/assets/images/i_shuttle.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_solar.png b/src/assets/images/i_solar.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_sun.png b/src/assets/images/i_sun.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_table.png b/src/assets/images/i_table.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_target.png b/src/assets/images/i_target.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_thematic.png b/src/assets/images/i_thematic.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_vertical.png b/src/assets/images/i_vertical.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_webcam.png b/src/assets/images/i_webcam.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_widget.png b/src/assets/images/i_widget.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_wind.png b/src/assets/images/i_wind.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_zoomfull.png b/src/assets/images/i_zoomfull.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_zoomin.png b/src/assets/images/i_zoomin.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_zoomnext.png b/src/assets/images/i_zoomnext.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_zoomout.png b/src/assets/images/i_zoomout.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/i_zoomprevious.png b/src/assets/images/i_zoomprevious.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/it.png b/src/assets/images/it.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/jp.png b/src/assets/images/jp.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/layer.png b/src/assets/images/layer.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/loader.swf b/src/assets/images/loader.swf
old mode 100644
new mode 100755
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/map-service.png b/src/assets/images/map-service.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/ru.png b/src/assets/images/ru.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/searchicon.png b/src/assets/images/searchicon.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/thumb.png b/src/assets/images/thumb.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/tip.png b/src/assets/images/tip.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/track.png b/src/assets/images/track.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/us.png b/src/assets/images/us.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_addend.png b/src/assets/images/w_addend.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_addstart.png b/src/assets/images/w_addstart.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_close.png b/src/assets/images/w_close.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_close_red.png b/src/assets/images/w_close_red.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_close_red2.png b/src/assets/images/w_close_red2.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_collapse.png b/src/assets/images/w_collapse.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_collapse_down.png b/src/assets/images/w_collapse_down.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_delete.png b/src/assets/images/w_delete.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_down.png b/src/assets/images/w_down.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_drag.png b/src/assets/images/w_drag.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_expand.png b/src/assets/images/w_expand.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_left.png b/src/assets/images/w_left.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_link.png b/src/assets/images/w_link.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_link_rtl.png b/src/assets/images/w_link_rtl.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_max.png b/src/assets/images/w_max.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_min.png b/src/assets/images/w_min.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_min_red.png b/src/assets/images/w_min_red.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_resize.png b/src/assets/images/w_resize.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_resize_rtl.png b/src/assets/images/w_resize_rtl.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_resizecursor.png b/src/assets/images/w_resizecursor.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_resizecursor_rtl.png b/src/assets/images/w_resizecursor_rtl.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_right.png b/src/assets/images/w_right.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/w_up.png b/src/assets/images/w_up.png
old mode 100644
new mode 100755
diff --git a/src/assets/images/yellowdot.png b/src/assets/images/yellowdot.png
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/AppEvent.as b/src/com/esri/viewer/AppEvent.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/BaseWidget.as b/src/com/esri/viewer/BaseWidget.as
old mode 100644
new mode 100755
index f45767e..368e541
--- a/src/com/esri/viewer/BaseWidget.as
+++ b/src/com/esri/viewer/BaseWidget.as
@@ -447,7 +447,7 @@ public class BaseWidget extends Module implements IBaseWidget
         AppEvent.dispatch(AppEvent.SHOW_INFOWINDOW, infoData);
     }
 
-    public function setMapAction(action:String, status:String, symbol:Symbol, callback:Function, showDrawTips:Boolean = true):void
+    public function setMapAction(action:String, status:String, symbol:Symbol, callback:Function, showDrawTips:Boolean = true, enableGraphicsLayerMouseEvents:Boolean = false):void
     {
         var data:Object =
             {
@@ -455,7 +455,8 @@ public class BaseWidget extends Module implements IBaseWidget
                 status: status,
                 symbol: symbol,
                 handler: callback,
-                showDrawTips: showDrawTips
+                showDrawTips: showDrawTips,
+                enableGraphicsLayerMouseEvents: enableGraphicsLayerMouseEvents
             };
         AppEvent.dispatch(AppEvent.SET_MAP_ACTION, data);
     }
diff --git a/src/com/esri/viewer/ConfigData.as b/src/com/esri/viewer/ConfigData.as
old mode 100644
new mode 100755
index 44b6415..8ca721b
--- a/src/com/esri/viewer/ConfigData.as
+++ b/src/com/esri/viewer/ConfigData.as
@@ -16,8 +16,6 @@
 package com.esri.viewer
 {
 
-import mx.collections.ArrayCollection;
-
 /**
  * ConfigData class is used to store configuration information from the config.xml file.
  */
@@ -41,7 +39,6 @@ public class ConfigData
     public var bingKey:String;
     public var proxyUrl:String;
     public var layoutDirection:String;
-    public var webMapLayers:ArrayCollection;
 
     public function ConfigData()
     {
diff --git a/src/com/esri/viewer/ErrorMessage.as b/src/com/esri/viewer/ErrorMessage.as
old mode 100644
new mode 100755
diff --git a/src/widgets/GeoRSS/GeoRSSFeed.as b/src/com/esri/viewer/ForcedImports.as
old mode 100644
new mode 100755
similarity index 59%
rename from src/widgets/GeoRSS/GeoRSSFeed.as
rename to src/com/esri/viewer/ForcedImports.as
index 38cbf90..d317b74
--- a/src/widgets/GeoRSS/GeoRSSFeed.as
+++ b/src/com/esri/viewer/ForcedImports.as
@@ -13,33 +13,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 ///////////////////////////////////////////////////////////////////////////
-package widgets.GeoRSS
+package com.esri.viewer
 {
 
-import com.esri.ags.Graphic;
-import com.esri.ags.geometry.Geometry;
-import com.esri.ags.geometry.MapPoint;
-import com.esri.ags.symbols.Symbol;
+// Make sure these classes are defined in root Viewer application
+// so that they will be shared by all the widgets.
 
-import flash.events.EventDispatcher;
+import com.esri.ags.tasks.PrintTask;
 
-[Bindable]
+PrintTask;
 
-public class GeoRSSFeed extends EventDispatcher
+public class ForcedImports
 {
-    public var content:String;
-
-    public var geometry:Geometry;
-
-    public var symbol:Symbol;
-
-    public var link:String;
-
-    public var point:MapPoint;
-
-    public var title:String;
-
-    public var graphic:Graphic;
 }
 
 }
diff --git a/src/com/esri/viewer/IBaseWidget.as b/src/com/esri/viewer/IBaseWidget.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/IInfowindowTemplate.as b/src/com/esri/viewer/IInfowindowTemplate.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/IWidgetContainer.as b/src/com/esri/viewer/IWidgetContainer.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/IWidgetTemplate.as b/src/com/esri/viewer/IWidgetTemplate.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/ViewerContainer.mxml b/src/com/esri/viewer/ViewerContainer.mxml
old mode 100644
new mode 100755
index 374eed4..5cb9f51
--- a/src/com/esri/viewer/ViewerContainer.mxml
+++ b/src/com/esri/viewer/ViewerContainer.mxml
@@ -22,11 +22,11 @@
 <s:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
          xmlns:s="library://ns.adobe.com/flex/spark"
          width="100%" height="100%"
-         creationComplete="creationCompleteHandler()">
+         creationComplete="creationCompleteHandler(event)"
+         initialize="initializeHandler(event)">
     <fx:Script>
         <![CDATA[
-            import com.esri.viewer.AppEvent;
-            import com.esri.viewer.ConfigData;
+            import com.esri.ags.components.IdentityManager;
             import com.esri.viewer.components.ErrorWindow;
             import com.esri.viewer.managers.ConfigManager;
             import com.esri.viewer.managers.DataManager;
@@ -39,6 +39,7 @@
 
             import mx.core.FlexGlobals;
             import mx.core.IVisualElement;
+            import mx.events.FlexEvent;
             import mx.events.ModuleEvent;
             import mx.logging.Log;
             import mx.logging.LogEventLevel;
@@ -46,7 +47,6 @@
             import mx.managers.PopUpManager;
             import mx.modules.IModuleInfo;
             import mx.modules.ModuleManager;
-            import mx.utils.ObjectUtil;
 
             //==============================================
             // Viewer default values
@@ -96,12 +96,19 @@
 
             public var scriptingManager:ScriptingManager;
 
+            ForcedImports; // make sure these classes are defined in the root application
+
             public static function getInstance():ViewerContainer
             {
                 return m_instance;
             }
 
-            private function creationCompleteHandler():void
+            private function initializeHandler(event:FlexEvent):void
+            {
+                IdentityManager.instance.enabled = true;
+            }
+
+            private function creationCompleteHandler(event:FlexEvent):void
             {
                 m_instance = this;
 
diff --git a/src/com/esri/viewer/WidgetStates.as b/src/com/esri/viewer/WidgetStates.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/WidgetTemplate.as b/src/com/esri/viewer/WidgetTemplate.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/components/AutoFontLabel.mxml b/src/com/esri/viewer/components/AutoFontLabel.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/components/ErrorWindow.mxml b/src/com/esri/viewer/components/ErrorWindow.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/components/HTMLPopup.mxml b/src/com/esri/viewer/components/HTMLPopup.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/components/HTMLPopupManager.as b/src/com/esri/viewer/components/HTMLPopupManager.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/components/InfoPopup.mxml b/src/com/esri/viewer/components/InfoPopup.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/components/TitlebarButton.as b/src/com/esri/viewer/components/TitlebarButton.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/components/toc/TOC.as b/src/com/esri/viewer/components/toc/TOC.as
old mode 100644
new mode 100755
index 52c4100..d31efd5
--- a/src/com/esri/viewer/components/toc/TOC.as
+++ b/src/com/esri/viewer/components/toc/TOC.as
@@ -94,6 +94,8 @@ public class TOC extends Tree
 
     private var _layerFiltersChanged:Boolean = false;
 
+    private var _basemapLayers:ArrayCollection;
+
     // Label function for TocMapLayerItem
     private var _labelFunction:Function = null;
     private var _labelFunctionChanged:Boolean = false;
@@ -233,6 +235,26 @@ public class TOC extends Tree
         onFilterChange();
     }
 
+    //--------------------------------------------------------------------------
+    //  basemapLayers
+    //--------------------------------------------------------------------------
+
+    /**
+     * A list of basemap layer objects and/or layer IDs.
+     */
+    public function get basemapLayers():Object
+    {
+        return _basemapLayers;
+    }
+
+    /**
+     * @private
+     */
+    public function set basemapLayers(value:Object):void
+    {
+        _basemapLayers = normalizeLayerFilter(value);
+    }
+
     //--------------------------------------------------------------------------
     //  labelFunction
     //--------------------------------------------------------------------------
@@ -397,7 +419,7 @@ public class TOC extends Tree
         var layer:Layer = event.layer;
         var index:int = event.index;
 
-        if (isGraphicsLayer(layer) || isHiddenLayer(layer))
+        if (isGraphicsLayer(layer) || isHiddenLayer(layer) || isLayerExcluded(layer))
         {
             return;
         }
@@ -487,7 +509,7 @@ public class TOC extends Tree
         for (var i:int = 0; i < layerIds.length; i++)
         {
             var layer:Layer = mapLayers.getItemAt(i) as Layer
-            if (isHiddenLayer(layer) || isGraphicsLayer(layer))
+            if (isHiddenLayer(layer) || isGraphicsLayer(layer) || islayerExcludedAndNotBaseMap(layer))
             {
                 continue;
             }
@@ -506,6 +528,45 @@ public class TOC extends Tree
         return layer.name.indexOf("hiddenLayer_") > -1;
     }
 
+    private function isLayerExcluded(layer:Layer):Boolean
+    {
+        var exclude:Boolean;
+        for each (var item:* in excludeLayers)
+        {
+            if ((item === layer || item == layer.name) || (item == layer.id))
+            {
+                exclude = true;
+                break;
+            }
+        }
+        return exclude;
+    }
+
+    private function islayerExcludedAndNotBaseMap(layer:Layer):Boolean
+    {
+        var exclude:Boolean;
+        for each (var item:* in excludeLayers)
+        {
+            if ((item === layer || item == layer.name) || (item == layer.id))
+            {
+                exclude = true;
+                for each (var item1:* in basemapLayers)
+                {
+                    if (item1 === item)
+                    {
+                        exclude = false;
+                        break;
+                    }
+                }
+                if (!exclude)
+                {
+                    break;
+                }
+            }
+        }
+        return exclude;
+    }
+
     private function unregisterAllMapLayers():void
     {
         _tocRoots.removeAll();
@@ -567,7 +628,7 @@ public class TOC extends Tree
                 trueMapLayerIndex++;
             }
         }
-        // now add at the correct index       
+        // now add at the correct index 
         _tocRoots.addItemAt(tocItem, _tocRoots.length - trueMapLayerIndex);
     }
 
@@ -641,7 +702,7 @@ public class TOC extends Tree
         }
     }
 
-    private function filterOutLayer(layer:Layer):Boolean
+    public function filterOutLayer(layer:Layer):Boolean
     {
         var exclude:Boolean = false;
         if (excludeGraphicsLayers && isGraphicsLayer(layer))
@@ -654,20 +715,12 @@ public class TOC extends Tree
         }
         if (!exclude && excludeLayers)
         {
-            exclude = false;
-            for each (var item:* in excludeLayers)
-            {
-                if ((item === layer || item == layer.name) || (item == layer.id))
-                {
-                    exclude = true;
-                    break;
-                }
-            }
+            exclude = isLayerExcluded(layer);
         }
         if (includeLayers)
         {
             exclude = true;
-            for each (item in includeLayers)
+            for each (var item:* in includeLayers)
             {
                 if (item === layer || item == layer.id)
                 {
diff --git a/src/com/esri/viewer/components/toc/controls/CheckBoxIndeterminate.as b/src/com/esri/viewer/components/toc/controls/CheckBoxIndeterminate.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/components/toc/controls/CheckBoxIndeterminateIcon.as b/src/com/esri/viewer/components/toc/controls/CheckBoxIndeterminateIcon.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/components/toc/tocClasses/TocItem.as b/src/com/esri/viewer/components/toc/tocClasses/TocItem.as
old mode 100644
new mode 100755
index 27a051a..9b10703
--- a/src/com/esri/viewer/components/toc/tocClasses/TocItem.as
+++ b/src/com/esri/viewer/components/toc/tocClasses/TocItem.as
@@ -136,6 +136,27 @@ public class TocItem extends EventDispatcher
         setVisible(value, true);
     }
 
+    internal static const DEFAULT_IS_IN_SCALE_RANGE:Boolean = true;
+
+    private var _isInScaleRange:Boolean = DEFAULT_IS_IN_SCALE_RANGE;
+
+    [Bindable("propertyChange")]
+    /**
+     * Whether the map layer referred to by this TOC item is enabled or not.
+     */
+    public function get isInScaleRange():Boolean
+    {
+        return _isInScaleRange;
+    }
+
+    /**
+     * @private
+     */
+    public function set isInScaleRange(value:Boolean):void
+    {
+        setIsInScaleRange(value, true);
+    }
+
     /**
      * Allows subclasses to change the visible state without causing a layer refresh.
      */
@@ -157,6 +178,26 @@ public class TocItem extends EventDispatcher
         }
     }
 
+    /**
+     * Allows subclasses to change the isInScaleRange state without causing a layer refresh.
+     */
+    internal function setIsInScaleRange(value:Boolean, layerRefresh:Boolean = true):void
+    {
+        if (value != _isInScaleRange)
+        {
+            var oldValue:Object = _isInScaleRange;
+            _isInScaleRange = value;
+
+            if (layerRefresh)
+            {
+                refreshLayer();
+            }
+
+            // Dispatch a property change event to notify the item renderer
+            dispatchEvent(PropertyChangeEvent.createUpdateEvent(this, "isInScaleRange", oldValue, value));
+        }
+    }
+
     private function setVisibleDirect(value:Boolean):void
     {
         if (value != _visible)
diff --git a/src/com/esri/viewer/components/toc/tocClasses/TocItemRenderer.as b/src/com/esri/viewer/components/toc/tocClasses/TocItemRenderer.as
old mode 100644
new mode 100755
index f9f47dc..119cb2c
--- a/src/com/esri/viewer/components/toc/tocClasses/TocItemRenderer.as
+++ b/src/com/esri/viewer/components/toc/tocClasses/TocItemRenderer.as
@@ -145,15 +145,25 @@ public class TocItemRenderer extends TreeItemRenderer
                 _layerMenuImage.visible = true;
             }
 
-            // Apply a bold label style to root nodes
             if (item.isTopLevel())
             {
+                // Apply a bold label style to root nodes
                 setStyle("fontWeight", "bold");
             }
             else
             {
                 setStyle("fontWeight", "normal");
             }
+            if (item.isInScaleRange)
+            {
+                alpha = 1;
+                setStyle("fontStyle", "normal");
+            }
+            else
+            {
+                alpha = 0.5;
+                setStyle("fontStyle", "italic");
+            }
         }
     }
 
diff --git a/src/com/esri/viewer/components/toc/tocClasses/TocKmlFolderItem.as b/src/com/esri/viewer/components/toc/tocClasses/TocKmlFolderItem.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/components/toc/tocClasses/TocKmlNetworkLinkItem.as b/src/com/esri/viewer/components/toc/tocClasses/TocKmlNetworkLinkItem.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/components/toc/tocClasses/TocLayerInfoItem.as b/src/com/esri/viewer/components/toc/tocClasses/TocLayerInfoItem.as
old mode 100644
new mode 100755
index 11e4ad6..d6f2505
--- a/src/com/esri/viewer/components/toc/tocClasses/TocLayerInfoItem.as
+++ b/src/com/esri/viewer/components/toc/tocClasses/TocLayerInfoItem.as
@@ -26,7 +26,7 @@ import com.esri.ags.layers.supportClasses.LayerInfo;
  */
 public class TocLayerInfoItem extends TocItem
 {
-    public function TocLayerInfoItem(parentItem:TocItem, layerInfo:LayerInfo, isVisible:Boolean)
+    public function TocLayerInfoItem(parentItem:TocItem, layerInfo:LayerInfo, isVisible:Boolean, isInScaleRange:Boolean)
     {
         super(parentItem);
 
@@ -34,6 +34,7 @@ public class TocLayerInfoItem extends TocItem
         label = layerInfo.name;
 
         setVisible(isVisible, false);
+        setIsInScaleRange(isInScaleRange, false);
     }
 
     //--------------------------------------------------------------------------
@@ -49,27 +50,6 @@ public class TocLayerInfoItem extends TocItem
     {
         return _layerInfo;
     }
-
-    //--------------------------------------------------------------------------
-    //
-    //  Methods
-    //
-    //--------------------------------------------------------------------------
-
-    /**
-     * @private
-     */
-    override internal function setVisible(value:Boolean, layerRefresh:Boolean = true):void
-    {
-        // Set the visible state of this item, but defer the layer refresh
-        super.setVisible(value, false);
-
-        // Allow the layer refresh now that all changes have been made
-        if (layerRefresh)
-        {
-            refreshLayer();
-        }
-    }
 }
 
 }
diff --git a/src/com/esri/viewer/components/toc/tocClasses/TocLayerMenu.mxml b/src/com/esri/viewer/components/toc/tocClasses/TocLayerMenu.mxml
old mode 100644
new mode 100755
index b8dd3b6..a458131
--- a/src/com/esri/viewer/components/toc/tocClasses/TocLayerMenu.mxml
+++ b/src/com/esri/viewer/components/toc/tocClasses/TocLayerMenu.mxml
@@ -24,8 +24,6 @@
                    xmlns:mx="library://ns.adobe.com/flex/mx"
                    xmlns:esri="http://www.esri.com/2008/ags"
                    width="150" height="105"
-                   backgroundColor="{getStyle('contentBackgroundColor')}"
-                   borderColor="{getStyle('accentColor')}"
                    initialize="bordercontainer1_initializeHandler(event)"
                    rollOut="bordercontainer1_rollOutHandler(event)"
                    rollOver="bordercontainer1_rollOverHandler(event)">
@@ -55,10 +53,14 @@
             private var _item:Object;
             private var _layer:Layer;
             private var _map:Map;
+            private var _toc:TOC;
             private var _transparencyMenuItem:TransparencyMenuItem;
 
             private function bordercontainer1_initializeHandler(event:FlexEvent):void
             {
+                setStyle("backgroundColor", getStyle("contentBackgroundColor"));
+                setStyle("borderColor", getStyle("accentColor"));
+
                 geometryService.url = GeometryServiceSingleton.instance.url;
                 geometryService.token = GeometryServiceSingleton.instance.token;
                 geometryService.proxyURL = GeometryServiceSingleton.instance.proxyURL;
@@ -88,9 +90,8 @@
             {
                 if (parent is TOC)
                 {
-                    var toc:TOC = TOC(parent);
-
-                    var tocMapLayerItems:ArrayCollection = toc.dataProvider as ArrayCollection;
+                    _toc = TOC(parent);
+                    var tocMapLayerItems:ArrayCollection = _toc.dataProvider as ArrayCollection;
 
                     if (tocMapLayerItems.length == 1)
                     {
@@ -244,7 +245,7 @@
                 for (var i:int = 0; i < layers.length; i++)
                 {
                     const layer:Layer = layers.getItemAt(i) as Layer;
-                    if (layer.name.indexOf("hiddenLayer_") != -1 || (layer is GraphicsLayer && !(layer is FeatureLayer)))
+                    if (layer.name.indexOf("hiddenLayer_") != -1 || (layer is GraphicsLayer && !(layer is FeatureLayer)) || islayerExcludedAndNotBaseMap(layer))
                     {
                         continue;
                     }
@@ -253,6 +254,31 @@
                 return result;
             }
 
+            private function islayerExcludedAndNotBaseMap(layer:Layer):Boolean
+            {
+                var exclude:Boolean;
+                for each (var item:* in _toc.excludeLayers)
+                {
+                    if ((item === layer || item == layer.name) || (item == layer.id))
+                    {
+                        exclude = true;
+                        for each (var item1:* in _toc.basemapLayers)
+                        {
+                            if (item1 === item)
+                            {
+                                exclude = false;
+                                break;
+                            }
+                        }
+                        if (!exclude)
+                        {
+                            break;
+                        }
+                    }
+                }
+                return exclude;
+            }
+
             private function descriptionOrDownloadLabel_clickHandler(event:MouseEvent):void
             {
                 var url:String;
diff --git a/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as b/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
old mode 100644
new mode 100755
index db12d90..6a516d6
--- a/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
+++ b/src/com/esri/viewer/components/toc/tocClasses/TocMapLayerItem.as
@@ -16,6 +16,8 @@
 package com.esri.viewer.components.toc.tocClasses
 {
 
+import com.esri.ags.Map;
+import com.esri.ags.events.ExtentEvent;
 import com.esri.ags.events.LayerEvent;
 import com.esri.ags.layers.ArcGISDynamicMapServiceLayer;
 import com.esri.ags.layers.ArcGISTiledMapServiceLayer;
@@ -67,6 +69,8 @@ public class TocMapLayerItem extends TocItem
         _isMSOnly = isMapServiceOnly;
         // Set the initial visibility without causing a layer refresh
         setVisible(layer.visible, false);
+        // Indicate whether the item is in scale range without causing a layer refresh
+        setIsInScaleRange(layer.isInScaleRange, false);
 
         // check if the visiblelayers was set on the dynamic map servicelayer
         var opLayers:Array = ViewerContainer.getInstance().configData.opLayers;
@@ -97,6 +101,7 @@ public class TocMapLayerItem extends TocItem
             {
                 // Process the layer info immediately
                 createChildren();
+                layer.map.addEventListener(ExtentEvent.EXTENT_CHANGE, onExtentChange, false, 0, true);
             }
         }
 
@@ -106,6 +111,7 @@ public class TocMapLayerItem extends TocItem
         // Listen for changes in layer visibility
         layer.addEventListener(FlexEvent.SHOW, onLayerShow, false, 0, true);
         layer.addEventListener(FlexEvent.HIDE, onLayerHide, false, 0, true);
+        layer.addEventListener(LayerEvent.IS_IN_SCALE_RANGE_CHANGE, onScaleChange, false, 0, true);
     }
 
     //--------------------------------------------------------------------------
@@ -247,6 +253,7 @@ public class TocMapLayerItem extends TocItem
         if (!_isMSOnly)
         {
             createChildren();
+            layer.map.addEventListener(ExtentEvent.EXTENT_CHANGE, onExtentChange, false, 0, true);
         }
     }
 
@@ -260,6 +267,62 @@ public class TocMapLayerItem extends TocItem
         setVisible(layer.visible, true);
     }
 
+    private function onScaleChange(event:LayerEvent):void
+    {
+        setIsInScaleRange(layer.isInScaleRange, true);
+    }
+
+    private function onExtentChange(event:ExtentEvent):void
+    {
+        if (layer is ArcGISDynamicMapServiceLayer || layer is ArcGISTiledMapServiceLayer)
+        {
+            for each (var tocLayerInfoItem:TocLayerInfoItem in children)
+            {
+                updateEnabledBasedOnScale(tocLayerInfoItem, isTocLayerInfoItemInScale(tocLayerInfoItem.layerInfo));
+            }
+        }
+    }
+
+    private function updateEnabledBasedOnScale(tocLayerInfoItem:TocLayerInfoItem, isInScaleRange:Boolean):void
+    {
+        if (tocLayerInfoItem.children && tocLayerInfoItem.children.length)
+        {
+            tocLayerInfoItem.isInScaleRange = isInScaleRange;
+            for each (var childTocLayerInfoItem:TocLayerInfoItem in tocLayerInfoItem.children.toArray())
+            {
+                updateEnabledBasedOnScale(childTocLayerInfoItem, tocLayerInfoItem.isInScaleRange && isTocLayerInfoItemInScale(childTocLayerInfoItem.layerInfo));
+            }
+        }
+        else
+        {
+            tocLayerInfoItem.isInScaleRange = isInScaleRange;
+        }
+    }
+
+    private function isTocLayerInfoItemInScale(layerInfo:LayerInfo):Boolean
+    {
+        var result:Boolean = true;
+        var map:Map = layer.map;
+
+        if (map && (layerInfo.maxScale > 0 || layerInfo.minScale > 0))
+        {
+            var scale:Number = map.scale;
+            if (layerInfo.maxScale > 0 && layerInfo.minScale > 0)
+            {
+                result = layerInfo.maxScale <= Math.ceil(scale) && Math.floor(scale) <= layerInfo.minScale;
+            }
+            else if (layerInfo.maxScale > 0)
+            {
+                result = layerInfo.maxScale <= Math.ceil(scale);
+            }
+            else if (layerInfo.minScale > 0)
+            {
+                result = Math.floor(scale) <= layerInfo.minScale;
+            }
+        }
+        return result;
+    }
+
     /**
      * Populates this item's children collection based on any layer info
      * of the map service.
@@ -315,7 +378,7 @@ public class TocMapLayerItem extends TocItem
             var rootLayers:Array = findRootLayers(layerInfos);
             for each (var layerInfo1:LayerInfo in rootLayers)
             {
-                addChild(createTocLayer(this, layerInfo1, layerInfos, layerInfo1.defaultVisibility));
+                addChild(createTocLayer(this, layerInfo1, layerInfos, layerInfo1.defaultVisibility, isTocLayerInfoItemInScale(layerInfo1)));
             }
         }
     }
@@ -361,7 +424,7 @@ public class TocMapLayerItem extends TocItem
         return result;
     }
 
-    private static function createKMLLayerTocItems(parentItem:TocItem, layer:KMLLayer):void
+    private function createKMLLayerTocItems(parentItem:TocItem, layer:KMLLayer):void
     {
         for each (var folder:KMLFolder in layer.folders)
         {
@@ -376,25 +439,13 @@ public class TocMapLayerItem extends TocItem
             // If the parent folder exists , do not create NetworkLinkItem as it is already created
             if (!(hasParentFolder(Number(networkLink.id), layer.folders)))
             {
-                // check if it is loaded
-                if (networkLink.loaded)
-                {
-                    parentItem.addChild(createKmlNetworkLinkTocItem(parentItem, networkLink, layer));
-                }
-                else
-                {
-                    networkLink.addEventListener(LayerEvent.LOAD, networkLinkLoadHandler);
-                }
-
-                function networkLinkLoadHandler(event:LayerEvent):void
-                {
-                    parentItem.addChild(createKmlNetworkLinkTocItem(parentItem, networkLink, layer));
-                }
+                // add network link 
+                parentItem.addChild(createKmlNetworkLinkTocItem(parentItem, networkLink, layer));
             }
         }
     }
 
-    private static function hasParentFolder(id:Number, folders:Array):Boolean
+    private function hasParentFolder(id:Number, folders:Array):Boolean
     {
         // find the immediate parent folder
         var parentFolderFound:Boolean;
@@ -426,7 +477,7 @@ public class TocMapLayerItem extends TocItem
         return parentFolderFound;
     }
 
-    private static function findRootLayers(layerInfos:Array):Array // of LayerInfo
+    private function findRootLayers(layerInfos:Array):Array // of LayerInfo
     {
         var roots:Array = [];
         for each (var layerInfo:LayerInfo in layerInfos)
@@ -441,7 +492,7 @@ public class TocMapLayerItem extends TocItem
         return roots;
     }
 
-    private static function findLayerById(id:Number, layerInfos:Array):LayerInfo
+    private function findLayerById(id:Number, layerInfos:Array):LayerInfo
     {
         for each (var layerInfo:LayerInfo in layerInfos)
         {
@@ -453,9 +504,9 @@ public class TocMapLayerItem extends TocItem
         return null;
     }
 
-    private static function createTocLayer(parentItem:TocItem, layerInfo:LayerInfo, layerInfos:Array, isVisible:Boolean):TocLayerInfoItem
+    private function createTocLayer(parentItem:TocItem, layerInfo:LayerInfo, layerInfos:Array, isVisible:Boolean, isInScaleRange:Boolean):TocLayerInfoItem
     {
-        var item:TocLayerInfoItem = new TocLayerInfoItem(parentItem, layerInfo, isVisible);
+        var item:TocLayerInfoItem = new TocLayerInfoItem(parentItem, layerInfo, isVisible, isInScaleRange);
 
         // Handle any sublayers of a group layer
         if (layerInfo.subLayerIds)
@@ -465,14 +516,14 @@ public class TocMapLayerItem extends TocItem
                 var childLayer:LayerInfo = findLayerById(childId, layerInfos);
                 if (childLayer)
                 {
-                    item.addChild(createTocLayer(item, childLayer, layerInfos, childLayer.defaultVisibility));
+                    item.addChild(createTocLayer(item, childLayer, layerInfos, childLayer.defaultVisibility, item.isInScaleRange && isTocLayerInfoItemInScale(childLayer)));
                 }
             }
         }
         return item;
     }
 
-    private static function createKmlFolderTocItem(parentItem:TocItem, folder:KMLFolder, folders:Array, layer:KMLLayer):TocKmlFolderItem
+    private function createKmlFolderTocItem(parentItem:TocItem, folder:KMLFolder, folders:Array, layer:KMLLayer):TocKmlFolderItem
     {
         var item:TocKmlFolderItem = new TocKmlFolderItem(parentItem, folder, layer);
 
@@ -503,7 +554,7 @@ public class TocMapLayerItem extends TocItem
         return item;
     }
 
-    private static function createKmlNetworkLinkTocItem(item:TocItem, networkLink:KMLLayer, layer:KMLLayer):TocKmlNetworkLinkItem
+    private function createKmlNetworkLinkTocItem(item:TocItem, networkLink:KMLLayer, layer:KMLLayer):TocKmlNetworkLinkItem
     {
         var tocKmlNetworkLinkItem:TocKmlNetworkLinkItem = new TocKmlNetworkLinkItem(item, networkLink, layer);
         if (networkLink.loaded)
@@ -523,7 +574,7 @@ public class TocMapLayerItem extends TocItem
         return tocKmlNetworkLinkItem;
     }
 
-    private static function findFolderById(id:Number, allFolders:Array):KMLFolder
+    private function findFolderById(id:Number, allFolders:Array):KMLFolder
     {
         var match:KMLFolder;
 
diff --git a/src/com/esri/viewer/components/toc/tocClasses/TransparencyMenuItem.mxml b/src/com/esri/viewer/components/toc/tocClasses/TransparencyMenuItem.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/components/toc/utils/MapUtil.as b/src/com/esri/viewer/components/toc/utils/MapUtil.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/managers/ConfigManager.as b/src/com/esri/viewer/managers/ConfigManager.as
old mode 100644
new mode 100755
index a243524..d45575d
--- a/src/com/esri/viewer/managers/ConfigManager.as
+++ b/src/com/esri/viewer/managers/ConfigManager.as
@@ -16,10 +16,6 @@
 package com.esri.viewer.managers
 {
 
-import com.esri.ags.clusterers.ESRIClusterer;
-import com.esri.ags.clusterers.WeightedClusterer;
-import com.esri.ags.clusterers.supportClasses.FlareSymbol;
-import com.esri.ags.clusterers.supportClasses.SimpleClusterSymbol;
 import com.esri.ags.events.WebMapEvent;
 import com.esri.ags.geometry.Extent;
 import com.esri.ags.layers.ArcGISDynamicMapServiceLayer;
@@ -30,21 +26,20 @@ import com.esri.ags.layers.KMLLayer;
 import com.esri.ags.layers.Layer;
 import com.esri.ags.layers.OpenStreetMapLayer;
 import com.esri.ags.layers.WMSLayer;
-import com.esri.ags.layers.WMTSLayer;
 import com.esri.ags.layers.supportClasses.LOD;
-import com.esri.ags.symbols.Symbol;
+import com.esri.ags.portal.WebMapUtil;
 import com.esri.ags.tasks.GeometryServiceSingleton;
 import com.esri.ags.virtualearth.VETiledLayer;
-import com.esri.ags.webmap.WebMapUtil;
 import com.esri.viewer.AppEvent;
 import com.esri.viewer.ConfigData;
 import com.esri.viewer.ViewerContainer;
+import com.esri.viewer.utils.LayerObjectUtil;
+import com.esri.viewer.utils.PortalBasemapAppender;
 
 import flash.events.Event;
 import flash.events.EventDispatcher;
 import flash.events.IOErrorEvent;
 import flash.events.SecurityErrorEvent;
-import flash.text.TextFormat;
 
 import mx.collections.ArrayCollection;
 import mx.resources.ResourceManager;
@@ -69,6 +64,8 @@ public class ConfigManager extends EventDispatcher
     private const CONFIG_MANAGER:String = "ConfigManager";
     private const DEFAULT_GEOMETRY_SERVICE_URL:String = "http://tasks.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer";
 
+    private var configData:ConfigData;
+
     public function ConfigManager()
     {
         //make sure the container is properly initialized and then
@@ -91,19 +88,17 @@ public class ConfigManager extends EventDispatcher
         configService.send();
     }
 
-    private function configService_faultHandler(event:mx.rpc.events.FaultEvent):void
+    private function configService_faultHandler(event:FaultEvent):void
     {
-        // happens if for example the main config file is missing or have crossdomain problem
-
         var sInfo:String = "";
 
-        // Missing config file
         if (event.fault.rootCause is IOErrorEvent)
         {
             var ioe:IOErrorEvent = event.fault.rootCause as IOErrorEvent;
-            if (ioe.text.indexOf("2032: Stream Error. URL:") > -1)
+            // Missing config file
+            if (ioe.errorID == 2032)
             {
-                sInfo += StringUtil.substitute(getDefaultString('missingConfigFileText'), ioe.text.substring(32)) + "\n\n";
+                sInfo += StringUtil.substitute(getDefaultString('missingConfigFileText'), ViewerContainer.configFile) + "\n\n";
             }
             else
             {
@@ -112,21 +107,17 @@ public class ConfigManager extends EventDispatcher
             }
         }
 
-        // config file with crossdomain issue
         if (event.fault.rootCause is SecurityErrorEvent)
         {
             var sec:SecurityErrorEvent = event.fault.rootCause as SecurityErrorEvent;
-            if (sec.text.indexOf("Error #2048: ") > -1) // debug player
-            {
-                sInfo += StringUtil.substitute(getDefaultString('configFileCrossDomain'), "\n", sec.text) + "\n\n";
-            }
-            else if (sec.text.indexOf("Error #2048") > -1) // non-debug player
+            // config file with crossdomain issue
+            if (sec.errorID == 2048)
             {
                 sInfo += StringUtil.substitute(getDefaultString('configFileCrossDomain'), "\n", sec.toString()) + "\n\n";
             }
+            // some other Security error
             else
             {
-                // some other Security error
                 sInfo += event.fault.rootCause + "\n\n";
             }
         }
@@ -148,7 +139,7 @@ public class ConfigManager extends EventDispatcher
         try
         {
             //parse main configuration file to create config data object
-            var configData:ConfigData = new ConfigData();
+            configData = new ConfigData();
             var configXML:XML = XML(event.result);
             configData.configXML = configXML;
 
@@ -578,6 +569,9 @@ public class ConfigManager extends EventDispatcher
                 arcGISWebMapItemID = ViewerContainer.urlConfigParams.itemid;
             }
 
+            var portalURL:String = configXML.map.@portalurl[0] || configXML.map.@arcgissharingurl[0];
+            var addArcGISBasemaps:Boolean = configXML.map.@addarcgisbasemaps[0] == "true";
+
             if (arcGISWebMapItemID)
             {
                 var webMapUtil:WebMapUtil = new WebMapUtil();
@@ -587,10 +581,9 @@ public class ConfigManager extends EventDispatcher
                 {
                     webMapUtil.geometryService = GeometryServiceSingleton.instance;
                 }
-                var arcgisSharingURL:String = configXML.map.@arcgissharingurl[0];
-                if (arcgisSharingURL)
+                if (portalURL)
                 {
-                    webMapUtil.arcgisSharingURL = arcgisSharingURL;
+                    webMapUtil.portalURL = portalURL;
                 }
                 webMapUtil.createMapById(arcGISWebMapItemID, new Responder(webMapUtil_createMapByIdResultHandler, webMapUtil_createMapByIdFaultHandler));
                 function webMapUtil_createMapByIdResultHandler(result:WebMapEvent):void
@@ -607,7 +600,6 @@ public class ConfigManager extends EventDispatcher
                     }
 
                     var layers:ArrayCollection = result.map.layers as ArrayCollection;
-                    configData.webMapLayers = layers;
                     for (i = 0; i < layers.length; i++)
                     {
                         var layer:Layer = layers[i];
@@ -625,121 +617,12 @@ public class ConfigManager extends EventDispatcher
                         }
                         layer.id = label;
 
-                        var lyrXML:XML = null;
-                        if (layer is ArcGISDynamicMapServiceLayer)
-                        {
-                            var dynLyr:ArcGISDynamicMapServiceLayer = layer as ArcGISDynamicMapServiceLayer;
-                            lyrXML = <layer label={label}
-                                    type="dynamic"
-                                    visible={dynLyr.visible}
-                                    alpha={dynLyr.alpha}
-                                    useproxy={dynLyr.proxyURL != null}
-                                    url={dynLyr.url}/>;
-                            if (dynLyr.visibleLayers)
-                            {
-                                lyrXML.@visiblelayers = dynLyr.visibleLayers.toArray().join();
-                            }
-                        }
-                        else if (layer is ArcGISImageServiceLayer)
-                        {
-                            var imgLyr:ArcGISImageServiceLayer = layer as ArcGISImageServiceLayer;
-                            lyrXML = <layer label={label}
-                                    type="image"
-                                    visible={imgLyr.visible}
-                                    alpha={imgLyr.alpha}
-                                    useproxy={imgLyr.proxyURL != null}
-                                    url={imgLyr.url}/>;
-                            if (imgLyr.bandIds)
-                            {
-                                lyrXML.@bandids = imgLyr.bandIds.join();
-                            }
-                        }
-                        else if (layer is ArcGISTiledMapServiceLayer)
-                        {
-                            var tiledLyr:ArcGISTiledMapServiceLayer = layer as ArcGISTiledMapServiceLayer;
-                            lyrXML = <layer label={label}
-                                    type="tiled"
-                                    visible={tiledLyr.visible}
-                                    alpha={tiledLyr.alpha}
-                                    useproxy={tiledLyr.proxyURL != null}
-                                    url={tiledLyr.url}/>;
-                            if (tiledLyr.displayLevels)
-                            {
-                                lyrXML.@displaylevels = tiledLyr.displayLevels.join();
-                            }
-                        }
-                        else if (layer is FeatureLayer)
-                        {
-                            var feaLyr:FeatureLayer = layer as FeatureLayer;
-                            if (feaLyr.featureCollection)
-                            {
-                                lyrXML = <layer label={label}
-                                        type="feature"
-                                        visible={feaLyr.visible}
-                                        alpha={feaLyr.alpha}/>
-                            }
-                            else
-                            {
-                                lyrXML = <layer label={label}
-                                        type="feature"
-                                        visible={feaLyr.visible}
-                                        alpha={feaLyr.alpha}
-                                        mode={feaLyr.mode}
-                                        useproxy={feaLyr.proxyURL != null}
-                                        url={feaLyr.url}/>;
-                            }
-                        }
-                        else if (layer is OpenStreetMapLayer)
-                        {
-                            var osmLyr:OpenStreetMapLayer = layer as OpenStreetMapLayer;
-                            lyrXML = <layer label={label}
-                                    type="osm"
-                                    visible={osmLyr.visible}
-                                    alpha={osmLyr.alpha}/>;
-                        }
-                        else if (layer is VETiledLayer)
-                        {
-                            var veLyr:VETiledLayer = layer as VETiledLayer;
-                            lyrXML = <layer label={label}
-                                    type="bing"
-                                    visible={veLyr.visible}
-                                    alpha={veLyr.alpha}
-                                    style={veLyr.mapStyle}/>;
-                            if (veLyr.displayLevels)
-                            {
-                                lyrXML.@displaylevels = veLyr.displayLevels.join();
-                            }
-                        }
-                        else if (layer is KMLLayer)
-                        {
-                            var kmlLayer:KMLLayer = layer as KMLLayer;
-                            lyrXML = <layer label={label}
-                                    type="kml"
-                                    visible={kmlLayer.visible}
-                                    alpha={kmlLayer.alpha}
-                                    url={kmlLayer.url}/>;
-                        }
-                        else if (layer is WMSLayer)
-                        {
-                            var wmsLayer:WMSLayer = layer as WMSLayer;
-                            lyrXML = <layer label={label}
-                                    type="wms"
-                                    visible={wmsLayer.visible}
-                                    alpha={wmsLayer.alpha}
-                                    version={wmsLayer.version}
-                                    skipgetcapabilities={wmsLayer.skipGetCapabilities}
-                                    imageformat={wmsLayer.imageFormat}
-                                    url={wmsLayer.url}/>;
-                            if (wmsLayer.visibleLayers)
-                            {
-                                lyrXML.@visiblelayers = wmsLayer.visibleLayers.toArray().join();
-                            }
-                        }
+                        var lyrXML:XML = createLayerXML(layer, label);
                         if (lyrXML)
                         {
                             if (isOpLayer)
                             {
-                                configData.opLayers.push(getLayerObject(lyrXML, i, true, bingKey, layer));
+                                configData.opLayers.push(LayerObjectUtil.getLayerObject(lyrXML, i, true, bingKey, layer));
                             }
                             else
                             {
@@ -747,7 +630,7 @@ public class ConfigManager extends EventDispatcher
                                 {
                                     lyrXML.@reference = true;
                                 }
-                                configData.basemaps.push(getLayerObject(lyrXML, i, false, bingKey, layer));
+                                configData.basemaps.push(LayerObjectUtil.getLayerObject(lyrXML, i, false, bingKey, layer));
                             }
                         }
                     }
@@ -765,8 +648,17 @@ public class ConfigManager extends EventDispatcher
                             mapAttrs.push(iExt);
                         }
                     }
-                    AppEvent.dispatch(AppEvent.CONFIG_LOADED, configData);
+
+                    if (addArcGISBasemaps)
+                    {
+                        appendPortalBasemaps();
+                    }
+                    else
+                    {
+                        AppEvent.dispatch(AppEvent.CONFIG_LOADED, configData);
+                    }
                 }
+
                 function webMapUtil_createMapByIdFaultHandler(error:Fault):void
                 {
                     AppEvent.showError(error.faultString, CONFIG_MANAGER);
@@ -787,7 +679,7 @@ public class ConfigManager extends EventDispatcher
 
                 for (i = 0; i < maplayerList.length(); i++)
                 {
-                    configBasemaps.push(getLayerObject(maplayerList[i], i, false, bingKey));
+                    configBasemaps.push(LayerObjectUtil.getLayerObject(maplayerList[i], i, false, bingKey));
                 }
                 configData.basemaps = configBasemaps;
 
@@ -798,7 +690,7 @@ public class ConfigManager extends EventDispatcher
                 var opLayerList:XMLList = configXML.map.operationallayers.layer;
                 for (i = 0; i < opLayerList.length(); i++)
                 {
-                    configOpLayers.push(getLayerObject(opLayerList[i], i, true, bingKey));
+                    configOpLayers.push(LayerObjectUtil.getLayerObject(opLayerList[i], i, true, bingKey));
                 }
                 configData.opLayers = configOpLayers;
             }
@@ -1032,7 +924,14 @@ public class ConfigManager extends EventDispatcher
                 //================================================
                 //announce configuration is complete
                 //================================================
-                AppEvent.dispatch(AppEvent.CONFIG_LOADED, configData);
+                if (addArcGISBasemaps)
+                {
+                    appendPortalBasemaps();
+                }
+                else
+                {
+                    AppEvent.dispatch(AppEvent.CONFIG_LOADED, configData);
+                }
             }
         }
         catch (error:Error)
@@ -1041,387 +940,145 @@ public class ConfigManager extends EventDispatcher
         }
     }
 
-    private function getLayerObject(obj:XML, num:Number, isOpLayer:Boolean, bingKey:String, layer:Layer = null):Object
+    private function createLayerXML(layer:Layer, label:String):XML
     {
-        var label:String = isOpLayer ? 'OpLayer ' + num : 'Map ' + num; // default label
-        if (obj.@label[0]) // check that label attribute exist
-        {
-            label = obj.@label; // set basemap label if specified in configuration file
-        }
-
-        var type:String;
-        if (!isOpLayer)
-        {
-            type = "tiled"; // default basemap type
-        }
-        if (obj.@type[0]) // check that type attribute exist
+        var lyrXML:XML = null;
+        if (layer is ArcGISDynamicMapServiceLayer)
         {
-            type = obj.@type; // set basemap type if specified in configuration file
-        }
-
-        // wms
-        var wkid:String;
-        if (obj.@wkid[0])
-        {
-            wkid = obj.@wkid;
-        }
-
-        var visible:Boolean = obj.@visible == "true";
-
-        var alpha:Number = 1.0;
-        if (obj.@alpha[0])
-        {
-            if (!isNaN(parseFloat(obj.@alpha)))
+            var dynLyr:ArcGISDynamicMapServiceLayer = layer as ArcGISDynamicMapServiceLayer;
+            lyrXML = <layer label={label}
+                    type="dynamic"
+                    visible={dynLyr.visible}
+                    alpha={dynLyr.alpha}
+                    useproxy={dynLyr.proxyURL != null}
+                    url={dynLyr.url}/>;
+            if (dynLyr.visibleLayers)
             {
-                alpha = parseFloat(obj.@alpha);
+                lyrXML.@visiblelayers = dynLyr.visibleLayers.toArray().join();
             }
         }
-
-        var maxAllowableOffset:Number;
-        if (obj.@maxallowableoffset[0])
+        else if (layer is ArcGISImageServiceLayer)
         {
-            if (!isNaN(parseFloat(obj.@maxallowableoffset)))
+            var imgLyr:ArcGISImageServiceLayer = layer as ArcGISImageServiceLayer;
+            lyrXML = <layer label={label}
+                    type="image"
+                    visible={imgLyr.visible}
+                    alpha={imgLyr.alpha}
+                    useproxy={imgLyr.proxyURL != null}
+                    url={imgLyr.url}/>;
+            if (imgLyr.bandIds)
             {
-                maxAllowableOffset = parseFloat(obj.@maxallowableoffset);
+                lyrXML.@bandids = imgLyr.bandIds.join();
             }
         }
-
-        var noData:Number;
-        if (obj.@nodata[0])
+        else if (layer is ArcGISTiledMapServiceLayer)
         {
-            if (!isNaN(parseFloat(obj.@nodata)))
+            var tiledLyr:ArcGISTiledMapServiceLayer = layer as ArcGISTiledMapServiceLayer;
+            lyrXML = <layer label={label}
+                    type="tiled"
+                    visible={tiledLyr.visible}
+                    alpha={tiledLyr.alpha}
+                    useproxy={tiledLyr.proxyURL != null}
+                    url={tiledLyr.url}/>;
+            if (tiledLyr.displayLevels)
             {
-                noData = parseFloat(obj.@nodata);
+                lyrXML.@displaylevels = tiledLyr.displayLevels.join();
             }
         }
-
-        var autoRefresh:Number = 0;
-        if (obj.@autorefresh[0])
+        else if (layer is FeatureLayer)
         {
-            if (!isNaN(parseInt(obj.@autorefresh)))
+            var feaLyr:FeatureLayer = layer as FeatureLayer;
+            if (feaLyr.featureCollection)
             {
-                autoRefresh = parseInt(obj.@autorefresh);
+                lyrXML = <layer label={label}
+                        type="feature"
+                        visible={feaLyr.visible}
+                        alpha={feaLyr.alpha}/>
+            }
+            else
+            {
+                lyrXML = <layer label={label}
+                        type="feature"
+                        visible={feaLyr.visible}
+                        alpha={feaLyr.alpha}
+                        mode={feaLyr.mode}
+                        useproxy={feaLyr.proxyURL != null}
+                        url={feaLyr.url}/>;
             }
         }
-
-        var clusterer:ESRIClusterer = parseClusterer(obj.clustering[0]);
-        var useProxy:Boolean = obj.@useproxy[0] && obj.@useproxy == "true"; // default false
-        var useMapTime:Boolean = obj.@usemaptime[0] ? obj.@usemaptime == "true" : true; // default true
-        var useAMF:String = obj.@useamf[0] ? obj.@useamf : "";
-        var token:String = obj.@token[0] ? obj.@token : "";
-        var mode:String = obj.@mode[0] ? obj.@mode : "";
-        var icon:String = isSupportedImageType(obj.@icon[0]) ? obj.@icon : 'assets/images/defaultBasemapIcon.png';
-        var layerId:String = obj.@layerid[0];
-        var imageFormat:String = obj.@imageformat;
-        var visibleLayers:String = obj.@visiblelayers;
-        var displayLevels:String = obj.@displaylevels;
-        var bandIds:String = obj.@bandids;
-        var skipGetCapabilities:String = obj.@skipgetcapabilities[0];
-        var version:String = obj.@version[0];
-        var url:String = obj.@url;
-        var serviceURL:String = obj.@serviceurl[0];
-        var serviceMode:String = obj.@servicemode[0];
-        var username:String = obj.@username;
-        var password:String = obj.@password;
-
-        // ve tiled layer
-        var style:String = obj.@style[0] ? obj.@style : "";
-        var key:String;
-        if (bingKey)
-        {
-            key = bingKey;
-        }
-        else
+        else if (layer is OpenStreetMapLayer)
         {
-            key = obj.@key[0] ? obj.@key : "";
+            var osmLyr:OpenStreetMapLayer = layer as OpenStreetMapLayer;
+            lyrXML = <layer label={label}
+                    type="osm"
+                    visible={osmLyr.visible}
+                    alpha={osmLyr.alpha}/>;
         }
-        var culture:String = obj.@culture[0] ? obj.@culture : "";
-
-        // arcims layer
-        var serviceHost:String = obj.@servicehost[0] ? obj.@servicehost : "";
-        var serviceName:String = obj.@servicename[0] ? obj.@servicename : "";
-
-        // definitionExpression for featurelayer
-        var definitionExpression:String = obj.@definitionexpression[0] ? obj.@definitionexpression : "";
-        var gdbVersion:String = obj.@gdbversion[0];
-
-        //sublayers
-        var subLayers:Array = [];
-        if (type == "tiled" || type == "dynamic")
+        else if (layer is VETiledLayer)
         {
-            var subLayersList:XMLList = obj.sublayer;
-            for (var i:int = 0; i < subLayersList.length(); i++)
+            var veLyr:VETiledLayer = layer as VETiledLayer;
+            lyrXML = <layer label={label}
+                    type="bing"
+                    visible={veLyr.visible}
+                    alpha={veLyr.alpha}
+                    style={veLyr.mapStyle}/>;
+            if (veLyr.displayLevels)
             {
-                subLayers.push({ id: String(subLayersList[i].@id), info: subLayersList[i].@info, infoConfig: subLayersList[i].@infoconfig, popUpConfig: subLayersList[i].@popupconfig, definitionExpression: String(subLayersList[i].@definitionexpression)});
+                lyrXML.@displaylevels = veLyr.displayLevels.join();
             }
         }
-
-        var resultObject:Object =
-            {
-                id: String(num),
-                alpha: alpha,
-                bandIds: bandIds,
-                autoRefresh: autoRefresh,
-                culture: culture,
-                clusterer: clusterer,
-                definitionExpression: definitionExpression,
-                displayLevels: displayLevels,
-                gdbVersion: gdbVersion,
-                icon: icon,
-                imageFormat: imageFormat,
-                key: key,
-                label: label,
-                layerId: layerId,
-                maxAllowableOffset: maxAllowableOffset,
-                mode: mode,
-                noData: noData,
-                password: password,
-                serviceHost: serviceHost,
-                serviceName: serviceName,
-                serviceMode: serviceMode,
-                serviceURL: serviceURL,
-                skipGetCapabilities: skipGetCapabilities,
-                style: style,
-                subLayers: subLayers,
-                token: token,
-                type: type,
-                url: url,
-                useAMF: useAMF,
-                useMapTime: useMapTime,
-                useProxy: useProxy,
-                username: username,
-                version: version,
-                visible: visible,
-                visibleLayers: visibleLayers,
-                wkid: wkid
-            };
-
-        // look for info, infoconfig and popupconfig on basemaps and operational layers
-        var opLayerInfo:String = obj.@info;
-        var opLayerInfoConfig:String = obj.@infoconfig;
-        var opLayerPopUpConfig:String = obj.@popupconfig;
-        resultObject.popUpConfig = opLayerPopUpConfig;
-        resultObject.infoConfig = opLayerInfoConfig;
-        resultObject.infoUrl = opLayerInfo;
-        resultObject.layer = layer;
-        if (!isOpLayer)
+        else if (layer is KMLLayer)
         {
-            var reference:Boolean = obj.@reference[0] && obj.@reference == "true";
-            resultObject.reference = reference;
+            var kmlLayer:KMLLayer = layer as KMLLayer;
+            lyrXML = <layer label={label}
+                    type="kml"
+                    visible={kmlLayer.visible}
+                    alpha={kmlLayer.alpha}
+                    url={kmlLayer.url}/>;
         }
-
-        return resultObject;
-    }
-
-    private function isSupportedImageType(filePath:String):Boolean
-    {
-        var endsWithSupportedImageFileType:RegExp = /\.(png|gif|jpg)$/i;
-        return endsWithSupportedImageFileType.test(filePath);
-    }
-
-    private function getDefaultString(token:String):String
-    {
-        return ResourceManager.getInstance().getString("ViewerStrings", token);
-    }
-
-    private function parseClusterer(clusteringXML:XML):ESRIClusterer
-    {
-        var clusterer:ESRIClusterer;
-
-        if (clusteringXML)
+        else if (layer is WMSLayer)
         {
-            var clusterSymbol:Symbol;
-            if (clusteringXML.clustersymbol[0])
+            var wmsLayer:WMSLayer = layer as WMSLayer;
+            lyrXML = <layer label={label}
+                    type="wms"
+                    visible={wmsLayer.visible}
+                    alpha={wmsLayer.alpha}
+                    version={wmsLayer.version}
+                    skipgetcapabilities={wmsLayer.skipGetCapabilities}
+                    imageformat={wmsLayer.imageFormat}
+                    url={wmsLayer.url}/>;
+            if (wmsLayer.maxImageHeight > 0)
             {
-                clusterSymbol = parseClusterSymbol(clusteringXML.clustersymbol[0]);
+                lyrXML.@maximageheight = wmsLayer.maxImageHeight;
             }
-
-            if (clusterSymbol)
+            if (wmsLayer.maxImageWidth > 0)
             {
-                clusterer = new WeightedClusterer();
-                if (clusteringXML.@mingraphiccount[0])
-                {
-                    clusterer.minGraphicCount = parseInt(clusteringXML.@mingraphiccount[0]);
-                }
-                if (clusteringXML.@sizeinpixels[0])
-                {
-                    clusterer.sizeInPixels = parseFloat(clusteringXML.@sizeinpixels[0]);
-                }
-                clusterer.symbol = clusterSymbol;
+                lyrXML.@maximagewidth = wmsLayer.maxImageWidth;
+            }
+            if (wmsLayer.visibleLayers)
+            {
+                lyrXML.@visiblelayers = wmsLayer.visibleLayers.toArray().join();
             }
         }
-
-        return clusterer;
-    }
-
-    private function parseClusterSymbol(clusterSymbolXML:XML):Symbol
-    {
-        var clusterSymbol:Symbol;
-
-        var type:String = clusterSymbolXML.@type;
-
-        if (type == "simple")
-        {
-            clusterSymbol = parseSimpleClusterSymbol(clusterSymbolXML);
-        }
-        else if (type == "flare")
-        {
-            clusterSymbol = parseFlareSymbol(clusterSymbolXML);
-        }
-
-        return clusterSymbol;
-    }
-
-    private function parseSimpleClusterSymbol(clusterSymbolXML:XML):Symbol
-    {
-        var simpleClusterSymbol:SimpleClusterSymbol = new SimpleClusterSymbol();
-
-        if (clusterSymbolXML.@alpha[0])
-        {
-            simpleClusterSymbol.alpha = parseFloat(clusterSymbolXML.@alpha[0]);
-        }
-        if (clusterSymbolXML.@color[0])
-        {
-            simpleClusterSymbol.color = parseInt(clusterSymbolXML.@color[0]);
-        }
-        if (clusterSymbolXML.@size[0])
-        {
-            simpleClusterSymbol.size = parseFloat(clusterSymbolXML.@size[0]);
-        }
-        if (clusterSymbolXML.@alphas[0])
-        {
-            simpleClusterSymbol.alphas = parseAlphas(clusterSymbolXML.@alphas[0]);
-        }
-        if (clusterSymbolXML.@sizes[0])
-        {
-            simpleClusterSymbol.sizes = parseSizes(clusterSymbolXML.@sizes[0]);
-        }
-        if (clusterSymbolXML.@weights[0])
-        {
-            simpleClusterSymbol.weights = parseWeights(clusterSymbolXML.@weights[0]);
-        }
-        if (clusterSymbolXML.@colors[0])
-        {
-            simpleClusterSymbol.colors = parseColors(clusterSymbolXML.@colors[0]);
-        }
-        var textFormat:TextFormat = parseTextFormat(clusterSymbolXML);
-
-        simpleClusterSymbol.textFormat = textFormat;
-
-        return simpleClusterSymbol;
-    }
-
-    private function parseAlphas(delimitedAlphas:String):Array
-    {
-        var alphas:Array = [];
-        var alphasToParse:Array = delimitedAlphas.split(',');
-        for each (var alpha:String in alphasToParse)
-        {
-            alphas.push(parseFloat(alpha));
-        }
-
-        return alphas;
-    }
-
-    private function parseSizes(delimitedSizes:String):Array
-    {
-        var sizes:Array = [];
-        var sizesToParse:Array = delimitedSizes.split(',');
-        for each (var size:String in sizesToParse)
-        {
-            sizes.push(parseFloat(size));
-        }
-
-        return sizes;
-    }
-
-    private function parseWeights(delimitedWeights:String):Array
-    {
-        var weights:Array = [];
-        var weightsToParse:Array = delimitedWeights.split(',');
-        for each (var weight:String in weightsToParse)
-        {
-            weights.push(parseFloat(weight));
-        }
-
-        return weights;
+        return lyrXML;
     }
 
-    private function parseColors(delimitedColors:String):Array
+    private function getDefaultString(token:String):String
     {
-        var colors:Array = [];
-        var colorsToParse:Array = delimitedColors.split(',');
-        for each (var color:String in colorsToParse)
-        {
-            colors.push(parseInt(color));
-        }
-        return colors;
+        return ResourceManager.getInstance().getString("ViewerStrings", token);
     }
 
-    private function parseTextFormat(clusterSymbolXML:XML):TextFormat
+    private function appendPortalBasemaps():void
     {
-        var textFormat:TextFormat = new TextFormat();
-
-        if (clusterSymbolXML.@textcolor[0])
-        {
-            textFormat.color = parseInt(clusterSymbolXML.@textcolor);
-        }
-        if (clusterSymbolXML.@textsize[0])
-        {
-            textFormat.size = parseInt(clusterSymbolXML.@textsize);
-        }
-
-        return textFormat;
+        var basemapAppender:PortalBasemapAppender = new PortalBasemapAppender("http://www.arcgis.com", configData);
+        basemapAppender.addEventListener(Event.COMPLETE, basemapAppender_completeHandler);
+        basemapAppender.fetchAndAppendPortalBasemaps();
     }
 
-    private function parseFlareSymbol(flareSymbolXML:XML):Symbol
+    protected function basemapAppender_completeHandler(event:Event):void
     {
-        var flareSymbol:FlareSymbol = new FlareSymbol();
-
-        if (flareSymbolXML)
-        {
-            if (flareSymbolXML.@alpha[0])
-            {
-                flareSymbol.backgroundAlpha = parseFloat(flareSymbolXML.@alpha[0]);
-            }
-            if (flareSymbolXML.@color[0])
-            {
-                flareSymbol.backgroundColor = parseInt(flareSymbolXML.@color[0])
-            }
-            if (flareSymbolXML.@bordercolor[0])
-            {
-                flareSymbol.borderColor = parseInt(flareSymbolXML.@bordercolor[0]);
-            }
-            if (flareSymbolXML.@flaremaxcount[0])
-            {
-                flareSymbol.flareMaxCount = parseInt(flareSymbolXML.@flaremaxcount[0])
-            }
-            if (flareSymbolXML.@size[0])
-            {
-                flareSymbol.size = parseFloat(flareSymbolXML.@size[0]);
-            }
-            if (flareSymbolXML.@alphas[0])
-            {
-                flareSymbol.backgroundAlphas = parseAlphas(flareSymbolXML.@alphas[0]);
-            }
-            if (flareSymbolXML.@sizes[0])
-            {
-                flareSymbol.sizes = parseSizes(flareSymbolXML.@sizes[0]);
-            }
-            if (flareSymbolXML.@weights[0])
-            {
-                flareSymbol.weights = parseWeights(flareSymbolXML.@weights[0]);
-            }
-            if (flareSymbolXML.@colors[0])
-            {
-                flareSymbol.backgroundColors = parseColors(flareSymbolXML.@colors[0]);
-            }
-
-            flareSymbol.textFormat = parseTextFormat(flareSymbolXML);
-        }
-
-        return flareSymbol;
+        (event.currentTarget as PortalBasemapAppender).removeEventListener(Event.COMPLETE, basemapAppender_completeHandler);
+        AppEvent.dispatch(AppEvent.CONFIG_LOADED, configData);
     }
 }
-
 }
diff --git a/src/com/esri/viewer/managers/DataManager.as b/src/com/esri/viewer/managers/DataManager.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/managers/EventBus.as b/src/com/esri/viewer/managers/EventBus.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/managers/LayerCreationProperties.as b/src/com/esri/viewer/managers/LayerCreationProperties.as
new file mode 100755
index 0000000..3d5c1a4
--- /dev/null
+++ b/src/com/esri/viewer/managers/LayerCreationProperties.as
@@ -0,0 +1,108 @@
+///////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2012 Esri. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+///////////////////////////////////////////////////////////////////////////
+package com.esri.viewer.managers
+{
+
+import com.esri.ags.clusterers.ESRIClusterer;
+
+public class LayerCreationProperties
+{
+    public var alpha:Number;
+    public var autoRefresh:Number;
+    public var bandIds:String;
+    public var bingMapKey:String;
+    public var clusterer:ESRIClusterer;
+    public var culture:String;
+    public var definitionExpression:String;
+    public var displayLevels:String;
+    public var gdbVersion:String;
+    public var imageFormat:String;
+    public var label:String;
+    public var layerId:String;
+    public var maxAllowableOffset:Number;
+    public var maxImageHeight:Number;
+    public var maxImageWidth:Number;
+    public var minScale:Number;
+    public var maxScale:Number;
+    public var mode:String;
+    public var noData:Number;
+    public var password:String;
+    public var proxyUrl:String;
+    public var serviceHost:String;
+    public var serviceName:String;
+    public var serviceMode:String;
+    public var serviceURL:String;
+    public var skipGetCapabilities:String;
+    public var style:String;
+    public var token:String;
+    public var type:String;
+    public var url:String;
+    public var useAMF:String;
+    public var useMapTime:Boolean;
+    public var useProxy:Boolean;
+    public var username:String;
+    public var version:String;
+    public var visible:Boolean;
+    public var visibleLayers:String;
+    public var wkid:Number;
+
+    public static function fromLayerObject(layerObject:Object):LayerCreationProperties
+    {
+        var creationProps:LayerCreationProperties = new LayerCreationProperties();
+
+        creationProps.alpha = Number(layerObject.alpha);
+        creationProps.autoRefresh = Number(layerObject.autoRefresh);
+        creationProps.bandIds = layerObject.bandIds;
+        creationProps.bingMapKey = layerObject.key;
+        creationProps.clusterer = layerObject.clusterer;
+        creationProps.culture = layerObject.culture;
+        creationProps.definitionExpression = layerObject.definitionExpression;
+        creationProps.displayLevels = layerObject.displayLevels;
+        creationProps.gdbVersion = layerObject.gdbVersion;
+        creationProps.imageFormat = layerObject.imageFormat;
+        creationProps.label = layerObject.label;
+        creationProps.layerId = layerObject.layerId;
+        creationProps.maxAllowableOffset = layerObject.maxAllowableOffset;
+        creationProps.maxImageHeight = layerObject.maxImageHeight;
+        creationProps.maxImageWidth = layerObject.maxImageWidth;
+        creationProps.minScale = layerObject.minScale;
+        creationProps.maxScale = layerObject.maxScale;
+        creationProps.mode = layerObject.mode;
+        creationProps.noData = Number(layerObject.noData);
+        creationProps.password = layerObject.password;
+        creationProps.proxyUrl = layerObject.proxyUrl;
+        creationProps.serviceHost = layerObject.serviceHost;
+        creationProps.serviceName = layerObject.serviceName;
+        creationProps.serviceMode = layerObject.serviceMode;
+        creationProps.serviceURL = layerObject.serviceURL;
+        creationProps.skipGetCapabilities = layerObject.skipGetCapabilities;
+        creationProps.style = layerObject.style;
+        creationProps.token = layerObject.token;
+        creationProps.type = layerObject.type;
+        creationProps.url = layerObject.url;
+        creationProps.useAMF = layerObject.useAMF;
+        creationProps.useMapTime = layerObject.useMapTime;
+        creationProps.useProxy = layerObject.useProxy;
+        creationProps.username = layerObject.username;
+        creationProps.version = layerObject.version;
+        creationProps.visible = layerObject.visible;
+        creationProps.visibleLayers = layerObject.visibleLayers;
+        creationProps.wkid = layerObject.wkid;
+
+        return creationProps;
+    }
+}
+}
diff --git a/src/com/esri/viewer/managers/LayerCreator.as b/src/com/esri/viewer/managers/LayerCreator.as
new file mode 100755
index 0000000..5a54ce3
--- /dev/null
+++ b/src/com/esri/viewer/managers/LayerCreator.as
@@ -0,0 +1,473 @@
+///////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2012 Esri. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+///////////////////////////////////////////////////////////////////////////
+package com.esri.viewer.managers
+{
+
+import com.esri.ags.SpatialReference;
+import com.esri.ags.layers.ArcGISDynamicMapServiceLayer;
+import com.esri.ags.layers.ArcGISImageServiceLayer;
+import com.esri.ags.layers.ArcGISTiledMapServiceLayer;
+import com.esri.ags.layers.ArcIMSMapServiceLayer;
+import com.esri.ags.layers.FeatureLayer;
+import com.esri.ags.layers.KMLLayer;
+import com.esri.ags.layers.Layer;
+import com.esri.ags.layers.OpenStreetMapLayer;
+import com.esri.ags.layers.WMSLayer;
+import com.esri.ags.layers.WMTSLayer;
+import com.esri.ags.virtualearth.VETiledLayer;
+
+import flash.utils.setInterval;
+
+import mx.collections.ArrayCollection;
+import mx.collections.ArrayList;
+
+public class LayerCreator
+{
+    public static function createLayerFromLayerObject(layerObject:Object):Layer
+    {
+        return createLayer(LayerCreationProperties.fromLayerObject(layerObject));
+    }
+
+    private static function createLayer(layerCreationProperties:LayerCreationProperties):Layer
+    {
+        var layerType:String = layerCreationProperties.type.toLowerCase();
+
+        if (layerType == "tiled")
+        {
+            return createTiledLayer(layerCreationProperties);
+        }
+        else if (layerType == "dynamic")
+        {
+            return createDynamicLayer(layerCreationProperties);
+        }
+        else if (layerType == "feature")
+        {
+            return createFeatureLayer(layerCreationProperties);
+        }
+        else if (layerType == "bing")
+        {
+            return createBingLayer(layerCreationProperties);
+        }
+        else if (layerType == "image")
+        {
+            return createImageLayer(layerCreationProperties);
+        }
+        else if (layerType == "arcims")
+        {
+            return createArcIMSLayer(layerCreationProperties);
+        }
+        else if (layerType == "wms")
+        {
+            return createWMSLayer(layerCreationProperties);
+        }
+        else if (layerType == "wmts")
+        {
+            return createWMTSLayer(layerCreationProperties);
+        }
+        else if (layerType == "osm")
+        {
+            return createOSMLayer(layerCreationProperties);
+        }
+        else if (layerType == "kml")
+        {
+            return createKMLLayer(layerCreationProperties);
+        }
+        else
+        {
+            //TODO: throw meaningful error instead.
+            return null;
+        }
+    }
+
+    private static function createTiledLayer(layerCreationProperties:LayerCreationProperties):ArcGISTiledMapServiceLayer
+    {
+        var tiledLayer:ArcGISTiledMapServiceLayer = new ArcGISTiledMapServiceLayer(layerCreationProperties.url);
+        tiledLayer.alpha = layerCreationProperties.alpha;
+        tiledLayer.id = layerCreationProperties.label;
+        tiledLayer.name = layerCreationProperties.label;
+        tiledLayer.token = layerCreationProperties.token;
+        tiledLayer.visible = layerCreationProperties.visible;
+        if (layerCreationProperties.displayLevels)
+        {
+            tiledLayer.displayLevels = layerCreationProperties.displayLevels.split(",");
+            for (var i:int = 0; i < tiledLayer.displayLevels.length; i++)
+            {
+                tiledLayer.displayLevels[i] = Number(tiledLayer.displayLevels[i]); // convert to Numbers
+            }
+        }
+        if (layerCreationProperties.proxyUrl && layerCreationProperties.useProxy)
+        {
+            tiledLayer.proxyURL = layerCreationProperties.proxyUrl;
+        }
+        if (!isNaN(layerCreationProperties.minScale))
+        {
+            tiledLayer.minScale = layerCreationProperties.minScale;
+        }
+        if (!isNaN(layerCreationProperties.maxScale))
+        {
+            tiledLayer.maxScale = layerCreationProperties.maxScale;
+        }
+        return tiledLayer;
+    }
+
+    private static function createDynamicLayer(layerCreationProperties:LayerCreationProperties):ArcGISDynamicMapServiceLayer
+    {
+        var dynLayer:ArcGISDynamicMapServiceLayer = new ArcGISDynamicMapServiceLayer(layerCreationProperties.url);
+        dynLayer.alpha = layerCreationProperties.alpha;
+        dynLayer.id = layerCreationProperties.label;
+        dynLayer.gdbVersion = layerCreationProperties.gdbVersion;
+        dynLayer.name = layerCreationProperties.label;
+        dynLayer.token = layerCreationProperties.token;
+        dynLayer.visible = layerCreationProperties.visible;
+        dynLayer.useMapTime = layerCreationProperties.useMapTime;
+        if (layerCreationProperties.autoRefresh > 0)
+        {
+            setInterval(dynLayer.refresh, layerCreationProperties.autoRefresh * 1000);
+        }
+        if (layerCreationProperties.imageFormat)
+        {
+            dynLayer.imageFormat = layerCreationProperties.imageFormat;
+        }
+        if (layerCreationProperties.visibleLayers)
+        {
+            var vizLayers:Array = layerCreationProperties.visibleLayers.split(",");
+            for (var i:int = 0; i < vizLayers.length; i++)
+            {
+                vizLayers[i] = Number(vizLayers[i]); // convert to Numbers
+            }
+            dynLayer.visibleLayers = new ArrayCollection(vizLayers);
+        }
+        if (layerCreationProperties.proxyUrl && layerCreationProperties.useProxy)
+        {
+            dynLayer.proxyURL = layerCreationProperties.proxyUrl;
+        }
+        if (!isNaN(layerCreationProperties.minScale))
+        {
+            dynLayer.minScale = layerCreationProperties.minScale;
+        }
+        if (!isNaN(layerCreationProperties.maxScale))
+        {
+            dynLayer.maxScale = layerCreationProperties.maxScale;
+        }
+        if (layerCreationProperties.maxImageHeight > 0)
+        {
+            dynLayer.maxImageHeight = layerCreationProperties.maxImageHeight;
+        }
+        if (layerCreationProperties.maxImageWidth > 0)
+        {
+            dynLayer.maxImageWidth = layerCreationProperties.maxImageWidth;
+        }
+        return dynLayer;
+    }
+
+    private static function createFeatureLayer(layerCreationProperties:LayerCreationProperties):FeatureLayer
+    {
+        var featureLayer:FeatureLayer = new FeatureLayer(layerCreationProperties.url);
+
+        featureLayer.alpha = layerCreationProperties.alpha;
+        featureLayer.id = layerCreationProperties.label;
+        featureLayer.gdbVersion = layerCreationProperties.gdbVersion;
+        featureLayer.name = layerCreationProperties.label;
+        featureLayer.maxAllowableOffset = layerCreationProperties.maxAllowableOffset;
+        featureLayer.outFields = [ '*' ]; // TODO: be smarter
+        featureLayer.token = layerCreationProperties.token;
+        featureLayer.visible = layerCreationProperties.visible;
+        featureLayer.useMapTime = layerCreationProperties.useMapTime;
+        featureLayer.clusterer = layerCreationProperties.clusterer;
+        if (layerCreationProperties.useAMF)
+        {
+            featureLayer.useAMF = (layerCreationProperties.useAMF == "true");
+        }
+        if (layerCreationProperties.mode)
+        {
+            featureLayer.mode = layerCreationProperties.mode;
+        }
+        if (layerCreationProperties.definitionExpression)
+        {
+            featureLayer.definitionExpression = layerCreationProperties.definitionExpression;
+        }
+        if (layerCreationProperties.proxyUrl && layerCreationProperties.useProxy)
+        {
+            featureLayer.proxyURL = layerCreationProperties.proxyUrl;
+        }
+        if (!isNaN(layerCreationProperties.minScale))
+        {
+            featureLayer.minScale = layerCreationProperties.minScale;
+        }
+        if (!isNaN(layerCreationProperties.maxScale))
+        {
+            featureLayer.maxScale = layerCreationProperties.maxScale;
+        }
+        // example for hard-coding layer symbology, e.g. for pre-10.0 ArcGIS Servers
+        /* if (label == "Traffic Cameras") // the layer label in main configuration file
+        {
+        var picSymbol:PictureMarkerSymbol = new PictureMarkerSymbol("assets/images/i_camera.png",30,30,0,0,0);
+        var rend:Renderer = new SimpleRenderer(picSymbol);
+        featureLayer.renderer = rend;
+        } */
+        return featureLayer;
+    }
+
+    private static function createBingLayer(layerCreationProperties:LayerCreationProperties):VETiledLayer
+    {
+        var veTiledLayer:VETiledLayer = new VETiledLayer();
+        veTiledLayer.id = layerCreationProperties.label;
+        veTiledLayer.name = layerCreationProperties.label;
+        veTiledLayer.key = layerCreationProperties.bingMapKey;
+        veTiledLayer.visible = layerCreationProperties.visible;
+        veTiledLayer.alpha = layerCreationProperties.alpha;
+        if (layerCreationProperties.style)
+        {
+            veTiledLayer.mapStyle = layerCreationProperties.style;
+        }
+        if (layerCreationProperties.culture)
+        {
+            veTiledLayer.culture = layerCreationProperties.culture;
+        }
+        if (layerCreationProperties.displayLevels)
+        {
+            veTiledLayer.displayLevels = layerCreationProperties.displayLevels.split(",");
+            for (var i:int = 0; i < veTiledLayer.displayLevels.length; i++)
+            {
+                veTiledLayer.displayLevels[i] = Number(veTiledLayer.displayLevels[i]); // convert to Numbers
+            }
+        }
+        if (!isNaN(layerCreationProperties.minScale))
+        {
+            veTiledLayer.minScale = layerCreationProperties.minScale;
+        }
+        if (!isNaN(layerCreationProperties.maxScale))
+        {
+            veTiledLayer.maxScale = layerCreationProperties.maxScale;
+        }
+        return veTiledLayer;
+    }
+
+    private static function createImageLayer(layerCreationProperties:LayerCreationProperties):ArcGISImageServiceLayer
+    {
+        var imgLayer:ArcGISImageServiceLayer = new ArcGISImageServiceLayer(layerCreationProperties.url);
+        imgLayer.id = layerCreationProperties.label;
+        imgLayer.name = layerCreationProperties.label;
+        imgLayer.alpha = layerCreationProperties.alpha;
+        imgLayer.token = layerCreationProperties.token;
+        imgLayer.visible = layerCreationProperties.visible;
+        imgLayer.noData = layerCreationProperties.noData;
+        imgLayer.useMapTime = layerCreationProperties.useMapTime;
+        if (layerCreationProperties.imageFormat)
+        {
+            imgLayer.imageFormat = layerCreationProperties.imageFormat;
+        }
+        if (layerCreationProperties.bandIds)
+        {
+            imgLayer.bandIds = layerCreationProperties.bandIds.split(",");
+            for (var i:int = 0; i < imgLayer.bandIds.length; i++)
+            {
+                imgLayer.bandIds[i] = Number(imgLayer.bandIds[i]); // convert to Numbers
+            }
+        }
+        if (layerCreationProperties.proxyUrl && layerCreationProperties.useProxy)
+        {
+            imgLayer.proxyURL = layerCreationProperties.proxyUrl;
+        }
+        if (!isNaN(layerCreationProperties.minScale))
+        {
+            imgLayer.minScale = layerCreationProperties.minScale;
+        }
+        if (!isNaN(layerCreationProperties.maxScale))
+        {
+            imgLayer.maxScale = layerCreationProperties.maxScale;
+        }
+        return imgLayer;
+    }
+
+    private static function createArcIMSLayer(layerCreationProperties:LayerCreationProperties):ArcIMSMapServiceLayer
+    {
+        var arcimsLayer:ArcIMSMapServiceLayer = new ArcIMSMapServiceLayer();
+        arcimsLayer.alpha = layerCreationProperties.alpha;
+        arcimsLayer.id = layerCreationProperties.label;
+        arcimsLayer.name = layerCreationProperties.label;
+        arcimsLayer.visible = layerCreationProperties.visible;
+        arcimsLayer.serviceHost = layerCreationProperties.serviceHost;
+        arcimsLayer.serviceName = layerCreationProperties.serviceName;
+        if (layerCreationProperties.autoRefresh > 0)
+        {
+            setInterval(arcimsLayer.refresh, layerCreationProperties.autoRefresh * 1000);
+        }
+        if (layerCreationProperties.imageFormat)
+        {
+            arcimsLayer.imageFormat = layerCreationProperties.imageFormat;
+        }
+        if (layerCreationProperties.visibleLayers)
+        {
+            var visLayers:Array = layerCreationProperties.visibleLayers.split(",");
+            arcimsLayer.visibleLayers = new ArrayCollection(visLayers);
+        }
+        if (layerCreationProperties.proxyUrl && layerCreationProperties.useProxy)
+        {
+            arcimsLayer.proxyURL = layerCreationProperties.proxyUrl;
+        }
+        if (layerCreationProperties.username && layerCreationProperties.password)
+        {
+            arcimsLayer.username = layerCreationProperties.username;
+            arcimsLayer.password = layerCreationProperties.password;
+        }
+        if (!isNaN(layerCreationProperties.minScale))
+        {
+            arcimsLayer.minScale = layerCreationProperties.minScale;
+        }
+        if (!isNaN(layerCreationProperties.maxScale))
+        {
+            arcimsLayer.maxScale = layerCreationProperties.maxScale;
+        }
+        return arcimsLayer;
+    }
+
+    private static function createWMSLayer(layerCreationProperties:LayerCreationProperties):WMSLayer
+    {
+        var wmsLayer:WMSLayer = new WMSLayer(layerCreationProperties.url);
+        wmsLayer.alpha = layerCreationProperties.alpha;
+        wmsLayer.id = layerCreationProperties.label;
+        wmsLayer.name = layerCreationProperties.label;
+        wmsLayer.visible = layerCreationProperties.visible;
+        if (layerCreationProperties.wkid)
+        {
+            wmsLayer.spatialReference = new SpatialReference(layerCreationProperties.wkid);
+        }
+        if (layerCreationProperties.autoRefresh > 0)
+        {
+            setInterval(wmsLayer.refresh, layerCreationProperties.autoRefresh * 1000);
+        }
+        if (layerCreationProperties.imageFormat)
+        {
+            wmsLayer.imageFormat = layerCreationProperties.imageFormat;
+        }
+        if (layerCreationProperties.visibleLayers)
+        {
+            var wmsVisLayers:Array = layerCreationProperties.visibleLayers.split(",");
+            wmsLayer.visibleLayers = new ArrayList(wmsVisLayers);
+        }
+        if (layerCreationProperties.proxyUrl && layerCreationProperties.useProxy)
+        {
+            wmsLayer.proxyURL = layerCreationProperties.proxyUrl;
+        }
+        if (layerCreationProperties.skipGetCapabilities)
+        {
+            wmsLayer.skipGetCapabilities = layerCreationProperties.skipGetCapabilities == "true";
+        }
+        if (layerCreationProperties.username && layerCreationProperties.password)
+        {
+            wmsLayer.username = layerCreationProperties.username;
+            wmsLayer.password = layerCreationProperties.password;
+        }
+        if (layerCreationProperties.version)
+        {
+            wmsLayer.version = layerCreationProperties.version;
+        }
+        if (!isNaN(layerCreationProperties.minScale))
+        {
+            wmsLayer.minScale = layerCreationProperties.minScale;
+        }
+        if (!isNaN(layerCreationProperties.maxScale))
+        {
+            wmsLayer.maxScale = layerCreationProperties.maxScale;
+        }
+        if (layerCreationProperties.maxImageHeight > 0)
+        {
+            wmsLayer.maxImageHeight = layerCreationProperties.maxImageHeight;
+        }
+        if (layerCreationProperties.maxImageWidth > 0)
+        {
+            wmsLayer.maxImageWidth = layerCreationProperties.maxImageWidth;
+        }
+        return wmsLayer;
+    }
+
+    private static function createWMTSLayer(layerCreationProperties:LayerCreationProperties):WMTSLayer
+    {
+        var wmtsLayer:WMTSLayer = new WMTSLayer(layerCreationProperties.url);
+        wmtsLayer.alpha = layerCreationProperties.alpha;
+        wmtsLayer.id = layerCreationProperties.label;
+        wmtsLayer.name = layerCreationProperties.label;
+        wmtsLayer.visible = layerCreationProperties.visible;
+        if (layerCreationProperties.imageFormat)
+        {
+            wmtsLayer.imageFormat = layerCreationProperties.imageFormat;
+        }
+        if (layerCreationProperties.proxyUrl && layerCreationProperties.useProxy)
+        {
+            wmtsLayer.proxyURL = layerCreationProperties.proxyUrl;
+        }
+        if (layerCreationProperties.serviceMode)
+        {
+            wmtsLayer.serviceMode = layerCreationProperties.serviceMode;
+        }
+        if (layerCreationProperties.layerId)
+        {
+            wmtsLayer.layerId = layerCreationProperties.layerId;
+        }
+        if (!isNaN(layerCreationProperties.minScale))
+        {
+            wmtsLayer.minScale = layerCreationProperties.minScale;
+        }
+        if (!isNaN(layerCreationProperties.maxScale))
+        {
+            wmtsLayer.maxScale = layerCreationProperties.maxScale;
+        }
+        return wmtsLayer;
+    }
+
+    private static function createOSMLayer(layerCreationProperties:LayerCreationProperties):OpenStreetMapLayer
+    {
+        var osmLayer:OpenStreetMapLayer = new OpenStreetMapLayer();
+        osmLayer.alpha = layerCreationProperties.alpha;
+        osmLayer.id = layerCreationProperties.label;
+        osmLayer.name = layerCreationProperties.label;
+        osmLayer.visible = layerCreationProperties.visible;
+        if (!isNaN(layerCreationProperties.minScale))
+        {
+            osmLayer.minScale = layerCreationProperties.minScale;
+        }
+        if (!isNaN(layerCreationProperties.maxScale))
+        {
+            osmLayer.maxScale = layerCreationProperties.maxScale;
+        }
+        return osmLayer;
+    }
+
+    private static function createKMLLayer(layerCreationProperties:LayerCreationProperties):KMLLayer
+    {
+        var kmlLayer:KMLLayer = new KMLLayer(layerCreationProperties.url);
+
+        kmlLayer.alpha = layerCreationProperties.alpha;
+        kmlLayer.id = layerCreationProperties.label;
+        kmlLayer.name = layerCreationProperties.label;
+        if (layerCreationProperties.serviceURL)
+        {
+            kmlLayer.serviceURL = layerCreationProperties.serviceURL;
+        }
+        if (!isNaN(layerCreationProperties.minScale))
+        {
+            kmlLayer.minScale = layerCreationProperties.minScale;
+        }
+        if (!isNaN(layerCreationProperties.maxScale))
+        {
+            kmlLayer.maxScale = layerCreationProperties.maxScale;
+        }
+        kmlLayer.visible = layerCreationProperties.visible;
+        return kmlLayer;
+    }
+}
+}
diff --git a/src/com/esri/viewer/managers/MapManager.mxml b/src/com/esri/viewer/managers/MapManager.mxml
old mode 100644
new mode 100755
index 960159d..98b3721
--- a/src/com/esri/viewer/managers/MapManager.mxml
+++ b/src/com/esri/viewer/managers/MapManager.mxml
@@ -35,27 +35,26 @@ Class used to configure the viewer map component (including layers) and handle m
             import com.esri.ags.Graphic;
             import com.esri.ags.Map;
             import com.esri.ags.SpatialReference;
-            import com.esri.ags.clusterers.ESRIClusterer;
             import com.esri.ags.events.DrawEvent;
             import com.esri.ags.events.LayerEvent;
             import com.esri.ags.events.MapEvent;
             import com.esri.ags.geometry.Extent;
             import com.esri.ags.geometry.MapPoint;
             import com.esri.ags.layers.ArcGISDynamicMapServiceLayer;
-            import com.esri.ags.layers.ArcGISImageServiceLayer;
             import com.esri.ags.layers.ArcGISTiledMapServiceLayer;
-            import com.esri.ags.layers.ArcIMSMapServiceLayer;
             import com.esri.ags.layers.FeatureLayer;
             import com.esri.ags.layers.KMLLayer;
             import com.esri.ags.layers.Layer;
-            import com.esri.ags.layers.OpenStreetMapLayer;
-            import com.esri.ags.layers.WMSLayer;
-            import com.esri.ags.layers.WMTSLayer;
             import com.esri.ags.layers.supportClasses.Field;
             import com.esri.ags.layers.supportClasses.LayerDetails;
             import com.esri.ags.layers.supportClasses.LayerInfoWindowRenderer;
             import com.esri.ags.layers.supportClasses.StaticLayer_m_esriLogo;
             import com.esri.ags.layers.supportClasses.TableDetails;
+            import com.esri.ags.portal.PopUpRenderer;
+            import com.esri.ags.portal.supportClasses.PopUpFieldFormat;
+            import com.esri.ags.portal.supportClasses.PopUpFieldInfo;
+            import com.esri.ags.portal.supportClasses.PopUpInfo;
+            import com.esri.ags.portal.supportClasses.PopUpMediaInfo;
             import com.esri.ags.symbols.PictureMarkerSymbol;
             import com.esri.ags.symbols.SimpleFillSymbol;
             import com.esri.ags.symbols.SimpleLineSymbol;
@@ -64,24 +63,17 @@ Class used to configure the viewer map component (including layers) and handle m
             import com.esri.ags.symbols.TextSymbol;
             import com.esri.ags.tools.DrawTool;
             import com.esri.ags.tools.NavigationTool;
-            import com.esri.ags.virtualearth.VETiledLayer;
-            import com.esri.ags.webmap.PopUpRenderer;
-            import com.esri.ags.webmap.supportClasses.PopUpFieldFormat;
-            import com.esri.ags.webmap.supportClasses.PopUpFieldInfo;
-            import com.esri.ags.webmap.supportClasses.PopUpInfo;
-            import com.esri.ags.webmap.supportClasses.PopUpMediaInfo;
             import com.esri.viewer.AppEvent;
             import com.esri.viewer.ConfigData;
             import com.esri.viewer.IBaseWidget;
             import com.esri.viewer.IInfowindowTemplate;
             import com.esri.viewer.ViewerContainer;
             import com.esri.viewer.components.InfoPopup;
-
+            import com.esri.viewer.utils.ErrorMessageUtil;
+            
             import mx.collections.ArrayCollection;
-            import mx.collections.ArrayList;
             import mx.containers.Canvas;
             import mx.controls.Alert;
-            import mx.core.FlexVersion;
             import mx.events.CloseEvent;
             import mx.events.FlexEvent;
             import mx.managers.CursorManagerPriority;
@@ -92,7 +84,7 @@ Class used to configure the viewer map component (including layers) and handle m
             import mx.rpc.events.ResultEvent;
             import mx.rpc.http.HTTPService;
             import mx.utils.StringUtil;
-
+            
             import spark.components.Group;
             import spark.globalization.SortingCollator;
 
@@ -187,12 +179,6 @@ Class used to configure the viewer map component (including layers) and handle m
 
             private function setViewerVersion():void
             {
-                var alertParent:Sprite;
-                if (FlexVersion.CURRENT_VERSION >= 0x04050000)
-                {
-                    // work-around for 4.5 regression - https://bugs.adobe.com/jira/browse/SDK-30755
-                    alertParent = ViewerContainer.getInstance();
-                }
                 var contextMenuText:String = getDefaultString("contextMenuText");
                 var aboutText:String = getDefaultString("aboutText");
                 var menuItem:ContextMenuItem = new ContextMenuItem(contextMenuText, true, true);
@@ -206,11 +192,11 @@ Class used to configure the viewer map component (including layers) and handle m
                     Alert.buttonWidth = 100;
                     Alert.yesLabel = getDefaultString("aboutLearnMoreBtn");
                     Alert.noLabel = getDefaultString("aboutCloseBtn");
-                    Alert.show(aboutText, contextMenuText, Alert.YES | Alert.NO, alertParent, function(event:CloseEvent):void
+                    Alert.show(aboutText, contextMenuText, Alert.YES | Alert.NO, null, function(event:CloseEvent):void
                     {
                         if (event.detail == Alert.YES)
                         {
-                            navigateToURL(new URLRequest("http://help.arcgis.com/en/webapps/flexviewer/"));
+                            navigateToURL(new URLRequest("http://resourcesbeta.arcgis.com/en/communities/flex-viewer/"));
                         }
                     }, StaticLayer_m_esriLogo, Alert.NO);
                     // restore labels to normal
@@ -269,29 +255,9 @@ Class used to configure the viewer map component (including layers) and handle m
 
                 configMapAttributes();
 
-                if (m_configData.webMapLayers)
-                {
-                    map.addEventListener(MapEvent.LAYER_ADD, layerloadComplete);
-                    for each (var layer:Layer in m_configData.webMapLayers)
-                    {
-                        if (layer is FeatureLayer)
-                        {
-                            layer.addEventListener(FlexEvent.HIDE, featureLayer_hideHandler);
-                        }
-                        if (layer is KMLLayer)
-                        {
-                            layer.addEventListener(FlexEvent.HIDE, kmlLayer_hideHandler);
-                        }
-                        map.addLayer(layer);
-                    }
-                    m_optLayerTable = m_configData.opLayers;
-                }
-                else
-                {
-                    configBasemaps();
-                    configOperationalLayers();
-                    configReferenceBasemaps();
-                }
+                configBasemaps();
+                configOperationalLayers();
+                configReferenceBasemaps();
 
                 setViewerVersion();
             }
@@ -525,400 +491,88 @@ Class used to configure the viewer map component (including layers) and handle m
 
             private function addLayerToMap(layerObject:Object):void
             {
-                const alpha:Number = Number(layerObject.alpha);
-                const autoRefresh:Number = Number(layerObject.autoRefresh);
-                const bandIds:String = layerObject.bandIds;
-                const bingMapKey:String = layerObject.key;
-                const clusterer:ESRIClusterer = layerObject.clusterer;
-                const culture:String = layerObject.culture;
-                const definitionExpression:String = layerObject.definitionExpression;
-                const displayLevels:String = layerObject.displayLevels;
-                const gdbVersion:String = layerObject.gdbVersion;
-                const imageFormat:String = layerObject.imageFormat;
-                const label:String = layerObject.label;
-                const layerId:String = layerObject.layerId;
-                const maxAllowableOffset:Number = layerObject.maxAllowableOffset;
-                const mode:String = layerObject.mode;
-                const noData:Number = Number(layerObject.noData);
-                const password:String = layerObject.password;
-                const proxyUrl:String = m_configData.proxyUrl;
-                const serviceHost:String = layerObject.serviceHost;
-                const serviceName:String = layerObject.serviceName;
-                const serviceMode:String = layerObject.serviceMode;
-                const serviceURL:String = layerObject.serviceURL;
-                const skipGetCapabilities:String = layerObject.skipGetCapabilities;
-                const style:String = layerObject.style;
-                const token:String = layerObject.token;
-                const type:String = layerObject.type;
-                const url:String = layerObject.url;
-                const useAMF:String = layerObject.useAMF;
-                const useMapTime:Boolean = layerObject.useMapTime;
-                const useProxy:Boolean = layerObject.useProxy;
-                const username:String = layerObject.username;
-                const version:String = layerObject.version;
-                const visible:Boolean = layerObject.visible;
-                const visibleLayers:String = layerObject.visibleLayers;
-                const wkid:Number = layerObject.wkid;
-
-                var i:int;
-                switch (type.toLowerCase())
+                //TODO: need to set when layerObject is created.
+                layerObject.proxyURL = m_configData.proxyUrl;
+                var layer:Layer = layerObject.layer ? layerObject.layer : LayerCreator.createLayerFromLayerObject(layerObject);
+                if (layer)
                 {
-                    case "tiled":
+                    layer.addEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
+                    layer.addEventListener(LayerEvent.LOAD, layer_loadEvent);
+                    if (layer is FeatureLayer)
                     {
-                        var tiledLayer:ArcGISTiledMapServiceLayer = new ArcGISTiledMapServiceLayer(url);
-                        tiledLayer.alpha = alpha;
-                        tiledLayer.id = label;
-                        tiledLayer.name = label;
-                        tiledLayer.token = token;
-                        tiledLayer.visible = visible;
-                        if (displayLevels)
-                        {
-                            tiledLayer.displayLevels = displayLevels.split(",");
-                            for (i = 0; i < tiledLayer.displayLevels.length; i++)
-                            {
-                                tiledLayer.displayLevels[i] = Number(tiledLayer.displayLevels[i]); // convert to Numbers
-                            }
-                        }
-                        if (proxyUrl && useProxy)
-                        {
-                            tiledLayer.proxyURL = proxyUrl;
-                        }
-                        layerObject.layer = tiledLayer;
-                        tiledLayer.addEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
-                        tiledLayer.addEventListener(LayerEvent.LOAD, layer_loadEvent);
-                        map.addLayer(tiledLayer);
-                        break;
+                        layer.addEventListener(FlexEvent.HIDE, featureLayer_hideHandler);
                     }
-                    case "dynamic":
+                    if (layer is KMLLayer)
                     {
-                        var dynLayer:ArcGISDynamicMapServiceLayer = new ArcGISDynamicMapServiceLayer(url);
-                        dynLayer.alpha = alpha;
-                        dynLayer.id = label;
-                        dynLayer.name = label;
-                        dynLayer.token = token;
-                        dynLayer.visible = visible;
-                        dynLayer.useMapTime = useMapTime;
-                        if (autoRefresh > 0)
-                        {
-                            setInterval(dynLayer.refresh, autoRefresh * 1000);
-                        }
-                        if (imageFormat)
-                        {
-                            dynLayer.imageFormat = imageFormat;
-                        }
-                        if (visibleLayers)
-                        {
-                            var vizLayers:Array = visibleLayers.split(",");
-                            for (i = 0; i < vizLayers.length; i++)
-                            {
-                                vizLayers[i] = Number(vizLayers[i]); // convert to Numbers
-                            }
-                            dynLayer.visibleLayers = new ArrayCollection(vizLayers);
-                        }
-                        if (proxyUrl && useProxy)
-                        {
-                            dynLayer.proxyURL = proxyUrl;
-                        }
-                        if (gdbVersion)
-                        {
-                            dynLayer.gdbVersion = gdbVersion;
-                        }
-                        layerObject.layer = dynLayer;
-                        dynLayer.addEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
-                        dynLayer.addEventListener(LayerEvent.LOAD, layer_loadEvent);
-                        map.addLayer(dynLayer);
-                        break;
+                        layer.addEventListener(FlexEvent.HIDE, kmlLayer_hideHandler);
                     }
-                    case "feature":
-                    {
-                        var featureLayer:FeatureLayer = new FeatureLayer(url);
-                        featureLayer.addEventListener(FlexEvent.HIDE, featureLayer_hideHandler);
-                        featureLayer.alpha = alpha;
-                        featureLayer.id = label;
-                        featureLayer.name = label;
-                        featureLayer.maxAllowableOffset = maxAllowableOffset;
-                        featureLayer.outFields = [ '*' ]; // TODO: be smarter
-                        featureLayer.token = token;
-                        featureLayer.visible = visible;
-                        featureLayer.useMapTime = useMapTime;
-                        featureLayer.clusterer = clusterer;
-                        if (gdbVersion)
-                        {
-                            featureLayer.gdbVersion = gdbVersion;
-                        }
-                        if (useAMF)
-                        {
-                            featureLayer.useAMF = (useAMF == "true");
-                        }
-                        if (mode)
-                        {
-                            featureLayer.mode = mode;
-                        }
-                        if (definitionExpression)
-                        {
-                            featureLayer.definitionExpression = definitionExpression;
-                        }
-                        if (proxyUrl && useProxy)
-                        {
-                            featureLayer.proxyURL = proxyUrl;
-                        }
-                        // example for hard-coding layer symbology, e.g. for pre-10.0 ArcGIS Servers
-                        /* if (label == "Traffic Cameras") // the layer label in main configuration file
-                        {
-                        var picSymbol:PictureMarkerSymbol = new PictureMarkerSymbol("assets/images/i_camera.png",30,30,0,0,0);
-                        var rend:Renderer = new SimpleRenderer(picSymbol);
-                        featureLayer.renderer = rend;
-                        } */
-                        layerObject.layer = featureLayer;
-                        featureLayer.addEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
-                        featureLayer.addEventListener(LayerEvent.LOAD, layer_loadEvent);
-                        map.addLayer(featureLayer);
-                        break;
-                    }
-                    case "bing":
-                    {
-                        var veTiledLayer:VETiledLayer = new VETiledLayer();
-                        veTiledLayer.id = label;
-                        veTiledLayer.name = label;
-                        veTiledLayer.key = bingMapKey;
-                        veTiledLayer.visible = visible;
-                        veTiledLayer.alpha = alpha;
-                        if (style)
-                        {
-                            veTiledLayer.mapStyle = style;
-                        }
-                        if (culture)
-                        {
-                            veTiledLayer.culture = culture;
-                        }
-                        if (displayLevels)
-                        {
-                            veTiledLayer.displayLevels = displayLevels.split(",");
-                            for (i = 0; i < veTiledLayer.displayLevels.length; i++)
-                            {
-                                veTiledLayer.displayLevels[i] = Number(veTiledLayer.displayLevels[i]); // convert to Numbers
-                            }
-                        }
-                        layerObject.layer = veTiledLayer;
-                        veTiledLayer.addEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
-                        veTiledLayer.addEventListener(LayerEvent.LOAD, layer_loadEvent);
-                        map.addLayer(veTiledLayer);
-                        break;
-                    }
-                    case "image":
-                    {
-                        var imgLayer:ArcGISImageServiceLayer = new ArcGISImageServiceLayer(url);
-                        imgLayer.id = label;
-                        imgLayer.name = label;
-                        imgLayer.alpha = alpha;
-                        imgLayer.token = token;
-                        imgLayer.visible = visible;
-                        imgLayer.noData = noData;
-                        imgLayer.useMapTime = useMapTime;
-                        if (imageFormat)
-                        {
-                            imgLayer.imageFormat = imageFormat;
-                        }
-                        if (bandIds)
-                        {
-                            imgLayer.bandIds = bandIds.split(",");
-                            for (i = 0; i < imgLayer.bandIds.length; i++)
-                            {
-                                imgLayer.bandIds[i] = Number(imgLayer.bandIds[i]); // convert to Numbers
-                            }
-                        }
-                        if (proxyUrl && useProxy)
-                        {
-                            imgLayer.proxyURL = proxyUrl;
-                        }
-                        layerObject.layer = imgLayer;
-                        imgLayer.addEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
-                        imgLayer.addEventListener(LayerEvent.LOAD, layer_loadEvent);
-                        map.addLayer(imgLayer);
-                        break;
-                    }
-                    case "arcims":
-                    {
-                        var arcimsLayer:ArcIMSMapServiceLayer = new ArcIMSMapServiceLayer();
-                        arcimsLayer.alpha = alpha;
-                        arcimsLayer.id = label;
-                        arcimsLayer.name = label;
-                        arcimsLayer.visible = visible;
-                        arcimsLayer.serviceHost = serviceHost;
-                        arcimsLayer.serviceName = serviceName;
-                        if (autoRefresh > 0)
-                        {
-                            setInterval(arcimsLayer.refresh, autoRefresh * 1000);
-                        }
-                        if (imageFormat)
-                        {
-                            arcimsLayer.imageFormat = imageFormat;
-                        }
-                        if (visibleLayers)
-                        {
-                            var visLayers:Array = visibleLayers.split(",");
-                            arcimsLayer.visibleLayers = new ArrayCollection(visLayers);
-                        }
-                        if (proxyUrl && useProxy)
-                        {
-                            arcimsLayer.proxyURL = proxyUrl;
-                        }
-                        if (username && password)
-                        {
-                            arcimsLayer.username = username;
-                            arcimsLayer.password = password;
-                        }
-                        layerObject.layer = arcimsLayer;
-                        arcimsLayer.addEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
-                        arcimsLayer.addEventListener(LayerEvent.LOAD, layer_loadEvent);
-                        map.addLayer(arcimsLayer);
-                        break;
-                    }
-                    case "wms":
-                    {
-                        var wmsLayer:WMSLayer = new WMSLayer(url);
-                        wmsLayer.alpha = alpha;
-                        wmsLayer.id = label;
-                        wmsLayer.name = label;
-                        wmsLayer.visible = visible;
-                        if (wkid)
-                        {
-                            wmsLayer.spatialReference = new SpatialReference(wkid);
-                        }
-                        if (autoRefresh > 0)
-                        {
-                            setInterval(wmsLayer.refresh, autoRefresh * 1000);
-                        }
-                        if (imageFormat)
-                        {
-                            wmsLayer.imageFormat = imageFormat;
-                        }
-                        if (visibleLayers)
-                        {
-                            var wmsVisLayers:Array = visibleLayers.split(",");
-                            wmsLayer.visibleLayers = new ArrayList(wmsVisLayers);
-                        }
-                        if (proxyUrl && useProxy)
-                        {
-                            wmsLayer.proxyURL = proxyUrl;
-                        }
-                        if (skipGetCapabilities)
-                        {
-                            wmsLayer.skipGetCapabilities = skipGetCapabilities == "true";
-                        }
-                        if (username && password)
-                        {
-                            wmsLayer.username = username;
-                            wmsLayer.password = password;
-                        }
-                        if (version)
-                        {
-                            wmsLayer.version = version;
-                        }
-                        layerObject.layer = wmsLayer;
-                        wmsLayer.addEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
-                        wmsLayer.addEventListener(LayerEvent.LOAD, layer_loadEvent);
-                        map.addLayer(wmsLayer);
-                        break;
-                    }
-                    case "wmts":
+
+                    layerObject.layer = layer;
+                    map.addLayer(layer);
+                }
+                else
+                {
+                    var errorMessage:String = StringUtil.substitute(getDefaultString('incorrectLayerTypeText'), "'" + layerObject.type + "'");
+                    AppEvent.showError(errorMessage, MAP_MANAGER);
+                }
+            }
+
+            private function layer_loadErrorEvent(event:LayerEvent):void
+            {
+                event.layer.removeEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
+                event.layer.removeEventListener(LayerEvent.LOAD, layer_loadEvent);
+    
+                if (event.fault.faultString != "Sign in aborted")
+                {
+                    var errorMessage:String = event.layer.name + " layer failed to load: " + ErrorMessageUtil.makeHTMLSafe(buildFaultMessage(event.fault));
+                    AppEvent.showError(errorMessage, MAP_MANAGER);                   
+                }
+                // remove layer from map and map switcher
+                removeLayerFromLayerObject(event.layer);
+                map.removeLayer(event.layer);
+            }
+
+            private function removeLayerFromLayerObject(layer:Layer):void
+            {
+                var layerFound:Boolean;
+                var i:int;
+                for (i = 0; i < m_configData.opLayers.length; )
+                {
+                    if (m_configData.opLayers[i].layer == layer)
                     {
-                        var wmtsLayer:WMTSLayer = new WMTSLayer(url);
-                        wmtsLayer.alpha = alpha;
-                        wmtsLayer.id = label;
-                        wmtsLayer.name = label;
-                        wmtsLayer.visible = visible;
-                        if (imageFormat)
-                        {
-                            wmtsLayer.imageFormat = imageFormat;
-                        }
-                        if (proxyUrl && useProxy)
-                        {
-                            wmtsLayer.proxyURL = proxyUrl;
-                        }
-                        if (serviceMode)
-                        {
-                            wmtsLayer.serviceMode = serviceMode;
-                        }
-                        if (layerId)
-                        {
-                            wmtsLayer.layerId = layerId;
-                        }
-                        layerObject.layer = wmtsLayer;
-                        wmtsLayer.addEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
-                        wmtsLayer.addEventListener(LayerEvent.LOAD, layer_loadEvent);
-                        map.addLayer(wmtsLayer);
+                        layerFound = true;
+                        m_configData.opLayers.splice(i, 1);
                         break;
                     }
-                    case "osm":
+                    else
                     {
-                        var osmLayer:OpenStreetMapLayer = new OpenStreetMapLayer();
-                        osmLayer.alpha = alpha;
-                        osmLayer.id = label;
-                        osmLayer.name = label;
-                        osmLayer.visible = visible;
-                        layerObject.layer = osmLayer;
-                        osmLayer.addEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
-                        osmLayer.addEventListener(LayerEvent.LOAD, layer_loadEvent);
-                        map.addLayer(osmLayer);
-                        break;
+                        i++;
                     }
-                    case "kml":
+                }
+                if (!layerFound)
+                {
+                    for (i = 0; i < m_configData.basemaps.length; )
                     {
-                        var kmlLayer:KMLLayer = new KMLLayer(url);
-                        kmlLayer.addEventListener(FlexEvent.HIDE, kmlLayer_hideHandler);
-                        kmlLayer.alpha = alpha;
-                        kmlLayer.id = label;
-                        kmlLayer.name = label;
-                        if (serviceURL)
+                        if (m_configData.basemaps[i].layer == layer)
                         {
-                            kmlLayer.serviceURL = serviceURL;
+                            layerFound = true;
+                            m_configData.basemaps.splice(i, 1);
+                            break;
                         }
-                        if (autoRefresh > 0)
+                        else
                         {
-                            setInterval(kmlLayer.refresh, autoRefresh * 1000);
+                            i++;
                         }
-                        kmlLayer.visible = visible;
-                        layerObject.layer = kmlLayer;
-                        kmlLayer.addEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
-                        kmlLayer.addEventListener(LayerEvent.LOAD, layer_loadEvent);
-                        map.addLayer(kmlLayer);
-                        break;
-                    }
-                    default:
-                    {
-                        var errorMessage:String = StringUtil.substitute(getDefaultString('incorrectLayerTypeText'), "'" + type + "'");
-                        AppEvent.showError(errorMessage, MAP_MANAGER);
-                        break;
                     }
                 }
             }
 
-            private function layer_loadErrorEvent(event:LayerEvent):void
-            {
-                event.layer.removeEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
-                event.layer.removeEventListener(LayerEvent.LOAD, layer_loadEvent);
-
-                if (event.fault.faultString != "LOGIN ABORTED")
-                {
-                    var errorMessage:String = event.layer.name + " layer failed to load: " + makeHTMLSafe(buildFaultMessage(event.fault));
-                    AppEvent.showError(errorMessage, MAP_MANAGER);
-                }
-            }
-
             private function layer_loadEvent(event:LayerEvent):void
             {
                 event.layer.removeEventListener(LayerEvent.LOAD_ERROR, layer_loadErrorEvent);
                 event.layer.removeEventListener(LayerEvent.LOAD, layer_loadEvent);
             }
 
-            private function makeHTMLSafe(content:String):String
-            {
-                content = content.replace(/>/g, "&gt;");
-                content = content.replace(/</g, "&lt;");
-                return content;
-            }
-
             private function buildFaultMessage(fault:Fault):String
             {
                 var faultMessage:String = StringUtil.substitute(getDefaultString('faultCode'), fault.faultCode) + "\n\n";
@@ -962,7 +616,7 @@ Class used to configure the viewer map component (including layers) and handle m
             {
                 if (layerObject.layer is ArcGISDynamicMapServiceLayer || layerObject.layer is ArcGISTiledMapServiceLayer)
                 {
-                    // look at the sublayers                   
+                    // look at the sublayers
                     var subLayers:Array = layerObject.subLayers as Array;
                     if ((subLayers).length > 0)
                     {
@@ -1638,6 +1292,7 @@ Class used to configure the viewer map component (including layers) and handle m
                 var status:String = data.status;
                 var symbol:Symbol = data.symbol;
                 var showDrawTips:Boolean = data.showDrawTips;
+                var enableGraphicsLayerMouseEvents:Boolean = data.enableGraphicsLayerMouseEvents;
 
                 if (tool)
                 {
@@ -1648,7 +1303,7 @@ Class used to configure the viewer map component (including layers) and handle m
 
                     m_drawEndFunction = data.handler;
                     m_navTool.deactivate();
-                    m_drawTool.activate(tool);
+                    m_drawTool.activate(tool, enableGraphicsLayerMouseEvents);
                     // showDrawTips
                     m_drawTool.showDrawTips = showDrawTips;
                     // reset symbology
diff --git a/src/com/esri/viewer/managers/OpenStreetMapCopyrightManager.as b/src/com/esri/viewer/managers/OpenStreetMapCopyrightManager.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/managers/ScriptingManager.as b/src/com/esri/viewer/managers/ScriptingManager.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/managers/SecurityManager.as b/src/com/esri/viewer/managers/SecurityManager.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/managers/UIManager.as b/src/com/esri/viewer/managers/UIManager.as
old mode 100644
new mode 100755
index bb78de2..422340e
--- a/src/com/esri/viewer/managers/UIManager.as
+++ b/src/com/esri/viewer/managers/UIManager.as
@@ -56,7 +56,7 @@ public class UIManager extends EventDispatcher
         configData.styleColors[2] = event.data.rolloverColor;
         configData.styleColors[3] = event.data.selectionColor;
         configData.styleColors[4] = event.data.titleColor;
-        configData.styleColors[5] = event.data.textColor;
+        configData.styleColors[5] = event.data.applicationBackgroundColor;
         configData.styleAlpha = event.data.alpha;
         setViewerStyle();
     }
@@ -287,11 +287,11 @@ public class UIManager extends EventDispatcher
 
         if (numberOfStyleColors > 4)
         {
-            var cssStyleDeclarationPopUpRendererLink:CSSStyleDeclaration = topLevelStyleManager.getStyleDeclaration("com.esri.ags.webmap.PopUpRenderer");
+            var cssStyleDeclarationPopUpRendererLink:CSSStyleDeclaration = topLevelStyleManager.getStyleDeclaration("com.esri.ags.portal.PopUpRenderer");
             cssStyleDeclarationPopUpRendererLink.setStyle("linkActiveColor", titleColor);
             cssStyleDeclarationPopUpRendererLink.setStyle("linkNormalColor", textColor);
             cssStyleDeclarationPopUpRendererLink.setStyle("linkHoverColor", titleColor);
-            topLevelStyleManager.setStyleDeclaration("com.esri.ags.webmap.PopUpRenderer", cssStyleDeclarationPopUpRendererLink, false);
+            topLevelStyleManager.setStyleDeclaration("com.esri.ags.portal.PopUpRenderer", cssStyleDeclarationPopUpRendererLink, false);
         }
 
         var cssStyleDeclarationContentNavigator:CSSStyleDeclaration = topLevelStyleManager.getStyleDeclaration("com.esri.ags.components.ContentNavigator");
@@ -434,7 +434,7 @@ public class UIManager extends EventDispatcher
         cssStyleDeclarationModal.setStyle("modalTransparencyColor", 0x777777);
         cssStyleDeclarationModal.setStyle("modalTransparencyBlur", 1);
         cssStyleDeclarationModal.setStyle("modalTransparency", 0.5);
-        cssStyleDeclarationModal.setStyle("modalTransparencyDuration", 1000); //messes up tween!
+        cssStyleDeclarationModal.setStyle("modalTransparencyDuration", 300); //messes up tween!
         topLevelStyleManager.setStyleDeclaration("global", cssStyleDeclarationModal, true);
     }
 }
diff --git a/src/com/esri/viewer/managers/WidgetManager.mxml b/src/com/esri/viewer/managers/WidgetManager.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/BasemapsButtonSkin.mxml b/src/com/esri/viewer/skins/BasemapsButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/GraphicalWidgetTemplateSkin.mxml b/src/com/esri/viewer/skins/GraphicalWidgetTemplateSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/HScrollBarSkin.mxml b/src/com/esri/viewer/skins/HScrollBarSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/HScrollBarThumbSkin.mxml b/src/com/esri/viewer/skins/HScrollBarThumbSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/HScrollBarTrackSkin.mxml b/src/com/esri/viewer/skins/HScrollBarTrackSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/MapManagerSkin.mxml b/src/com/esri/viewer/skins/MapManagerSkin.mxml
old mode 100644
new mode 100755
index d9e9aa7..c8d5e98
--- a/src/com/esri/viewer/skins/MapManagerSkin.mxml
+++ b/src/com/esri/viewer/skins/MapManagerSkin.mxml
@@ -21,8 +21,7 @@
 -->
 <s:Skin xmlns:fx="http://ns.adobe.com/mxml/2009"
         xmlns:s="library://ns.adobe.com/flex/spark"
-        xmlns:esri="http://www.esri.com/2008/ags"
-        layoutDirection="ltr">
+        xmlns:esri="http://www.esri.com/2008/ags">
 
     <fx:Metadata>
         [HostComponent("com.esri.viewer.managers.MapManager")]
diff --git a/src/com/esri/viewer/skins/ScrollBarDownButtonSkin.mxml b/src/com/esri/viewer/skins/ScrollBarDownButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/ScrollBarLeftButtonSkin.mxml b/src/com/esri/viewer/skins/ScrollBarLeftButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/ScrollBarRightButtonSkin.mxml b/src/com/esri/viewer/skins/ScrollBarRightButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/ScrollBarUpButtonSkin.mxml b/src/com/esri/viewer/skins/ScrollBarUpButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/TitlebarButtonSkin.mxml b/src/com/esri/viewer/skins/TitlebarButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/VScrollBarSkin.mxml b/src/com/esri/viewer/skins/VScrollBarSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/VScrollBarThumbSkin.mxml b/src/com/esri/viewer/skins/VScrollBarThumbSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/VScrollBarTrackSkin.mxml b/src/com/esri/viewer/skins/VScrollBarTrackSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/skins/WidgetTemplateSkin.mxml b/src/com/esri/viewer/skins/WidgetTemplateSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/utils/ClustererParser.as b/src/com/esri/viewer/utils/ClustererParser.as
new file mode 100755
index 0000000..e7f0e47
--- /dev/null
+++ b/src/com/esri/viewer/utils/ClustererParser.as
@@ -0,0 +1,297 @@
+package com.esri.viewer.utils
+{
+
+import com.esri.ags.clusterers.ESRIClusterer;
+import com.esri.ags.clusterers.WeightedClusterer;
+import com.esri.ags.clusterers.supportClasses.FlareSymbol;
+import com.esri.ags.clusterers.supportClasses.SimpleClusterSymbol;
+import com.esri.ags.symbols.Symbol;
+
+import flash.text.TextFormat;
+
+public class ClustererParser
+{
+    public function parseClusterer(clusteringXML:XML):ESRIClusterer
+    {
+        var clusterer:ESRIClusterer;
+
+        if (clusteringXML)
+        {
+            var clusterSymbol:Symbol;
+            if (clusteringXML.clustersymbol[0])
+            {
+                clusterSymbol = parseClusterSymbol(clusteringXML.clustersymbol[0]);
+            }
+
+            if (clusterSymbol)
+            {
+                clusterer = new WeightedClusterer();
+                if (clusteringXML.@mingraphiccount[0])
+                {
+                    var minGraphicCount:int = parseInt(clusteringXML.@mingraphiccount[0]);
+                    if (!isNaN(minGraphicCount))
+                    {
+                        clusterer.minGraphicCount = minGraphicCount;
+                    }
+                }
+                if (clusteringXML.@sizeinpixels[0])
+                {
+                    var sizeInPixels:Number = parseFloat(clusteringXML.@sizeinpixels[0]);
+                    if (!isNaN(sizeInPixels))
+                    {
+                        clusterer.sizeInPixels = sizeInPixels;
+                    }
+                }
+                clusterer.symbol = clusterSymbol;
+            }
+        }
+
+        return clusterer;
+    }
+
+    private function parseClusterSymbol(clusterSymbolXML:XML):Symbol
+    {
+        var clusterSymbol:Symbol;
+
+        var type:String = clusterSymbolXML.@type;
+
+        if (type == "simple")
+        {
+            clusterSymbol = parseSimpleClusterSymbol(clusterSymbolXML);
+        }
+        else if (type == "flare")
+        {
+            clusterSymbol = parseFlareSymbol(clusterSymbolXML);
+        }
+
+        return clusterSymbol;
+    }
+
+    private function parseSimpleClusterSymbol(clusterSymbolXML:XML):Symbol
+    {
+        var simpleClusterSymbol:SimpleClusterSymbol = new SimpleClusterSymbol();
+
+        if (clusterSymbolXML.@alpha[0])
+        {
+            var alpha:Number = parseFloat(clusterSymbolXML.@alpha[0]);
+            if (!isNaN(alpha))
+            {
+                simpleClusterSymbol.alpha = alpha;
+            }
+        }
+        if (clusterSymbolXML.@color[0])
+        {
+            var color:uint = parseInt(clusterSymbolXML.@color[0]);
+            if (!isNaN(color))
+            {
+                simpleClusterSymbol.color = color;
+            }
+        }
+        if (clusterSymbolXML.@size[0])
+        {
+            var size:Number = parseFloat(clusterSymbolXML.@size[0]);
+            if (!isNaN(size))
+            {
+                simpleClusterSymbol.size = size;
+            }
+        }
+        if (clusterSymbolXML.@alphas[0])
+        {
+            simpleClusterSymbol.alphas = parseAlphas(clusterSymbolXML.@alphas[0]);
+        }
+        if (clusterSymbolXML.@sizes[0])
+        {
+            simpleClusterSymbol.sizes = parseSizes(clusterSymbolXML.@sizes[0]);
+        }
+        if (clusterSymbolXML.@weights[0])
+        {
+            simpleClusterSymbol.weights = parseWeights(clusterSymbolXML.@weights[0]);
+        }
+        if (clusterSymbolXML.@colors[0])
+        {
+            simpleClusterSymbol.colors = parseColors(clusterSymbolXML.@colors[0]);
+        }
+        var textFormat:TextFormat = parseTextFormat(clusterSymbolXML);
+        simpleClusterSymbol.textFormat = textFormat;
+
+        return simpleClusterSymbol;
+    }
+
+    private function parseAlphas(delimitedAlphas:String):Array
+    {
+        var alphas:Array = [];
+        var alphasToParse:Array = delimitedAlphas.split(',');
+        var alpha:Number;
+        for each (var alphaToParse:String in alphasToParse)
+        {
+            alpha = parseFloat(alphaToParse);
+            if (isNaN(alpha))
+            {
+                alphas.push(1);
+            }
+            else
+            {
+                alphas.push(alpha);
+            }
+        }
+
+        return alphas;
+    }
+
+    private function parseSizes(delimitedSizes:String):Array
+    {
+        var sizes:Array = [];
+        var sizesToParse:Array = delimitedSizes.split(',');
+        var size:Number;
+        for each (var sizeToParse:String in sizesToParse)
+        {
+            size = parseFloat(sizeToParse);
+            if (isNaN(size))
+            {
+                sizes.push(0);
+            }
+            else
+            {
+                sizes.push(size);
+            }
+        }
+
+        return sizes;
+    }
+
+    private function parseWeights(delimitedWeights:String):Array
+    {
+        var weights:Array = [];
+        var weightsToParse:Array = delimitedWeights.split(',');
+        var weight:Number;
+        for each (var weightToParse:String in weightsToParse)
+        {
+            weight = parseFloat(weightToParse);
+            if (isNaN(weight))
+            {
+                weights.push(0);
+            }
+            else
+            {
+                weights.push(weight);
+            }
+        }
+
+        return weights;
+    }
+
+    private function parseColors(delimitedColors:String):Array
+    {
+        var colors:Array = [];
+        var colorsToParse:Array = delimitedColors.split(',');
+        var color:uint;
+        for each (var colorToParse:String in colorsToParse)
+        {
+            color = parseInt(colorToParse);
+
+            if (isNaN(color))
+            {
+                colors.push(0);
+            }
+            else
+            {
+                colors.push(color);
+            }
+        }
+        return colors;
+    }
+
+    private function parseTextFormat(clusterSymbolXML:XML):TextFormat
+    {
+        var textFormat:TextFormat = new TextFormat();
+
+        if (clusterSymbolXML.@textcolor[0])
+        {
+            var color:uint = parseInt(clusterSymbolXML.@textcolor);
+            if (!isNaN(color))
+            {
+                textFormat.color = color;
+            }
+        }
+        if (clusterSymbolXML.@textsize[0])
+        {
+            var size:int = parseInt(clusterSymbolXML.@textsize);
+            if (!isNaN(size))
+            {
+                textFormat.size = size;
+            }
+        }
+
+        return textFormat;
+    }
+
+    private function parseFlareSymbol(flareSymbolXML:XML):Symbol
+    {
+        var flareSymbol:FlareSymbol = new FlareSymbol();
+
+        if (flareSymbolXML)
+        {
+            if (flareSymbolXML.@alpha[0])
+            {
+                var alpha:Number = parseFloat(flareSymbolXML.@alpha[0]);
+                if (!isNaN(alpha))
+                {
+                    flareSymbol.backgroundAlpha = alpha;
+                }
+            }
+            if (flareSymbolXML.@color[0])
+            {
+                var color:uint = parseInt(flareSymbolXML.@color[0]);
+                if (!isNaN(color))
+                {
+                    flareSymbol.backgroundColor = color;
+                }
+            }
+            if (flareSymbolXML.@bordercolor[0])
+            {
+                var borderColor:uint = parseInt(flareSymbolXML.@bordercolor[0]);
+                if (!isNaN(borderColor))
+                {
+                    flareSymbol.borderColor = borderColor;
+                }
+            }
+            if (flareSymbolXML.@flaremaxcount[0])
+            {
+                var flareMaxCount:int = parseInt(flareSymbolXML.@flaremaxcount[0]);
+                if (!isNaN(flareMaxCount))
+                {
+                    flareSymbol.flareMaxCount = flareMaxCount;
+                }
+            }
+            if (flareSymbolXML.@size[0])
+            {
+                var size:Number = parseFloat(flareSymbolXML.@size[0]);
+                if (!isNaN(size))
+                {
+                    flareSymbol.size = size;
+                }
+            }
+            if (flareSymbolXML.@alphas[0])
+            {
+                flareSymbol.backgroundAlphas = parseAlphas(flareSymbolXML.@alphas[0]);
+            }
+            if (flareSymbolXML.@sizes[0])
+            {
+                flareSymbol.sizes = parseSizes(flareSymbolXML.@sizes[0]);
+            }
+            if (flareSymbolXML.@weights[0])
+            {
+                flareSymbol.weights = parseWeights(flareSymbolXML.@weights[0]);
+            }
+            if (flareSymbolXML.@colors[0])
+            {
+                flareSymbol.backgroundColors = parseColors(flareSymbolXML.@colors[0]);
+            }
+
+            flareSymbol.textFormat = parseTextFormat(flareSymbolXML);
+        }
+
+        return flareSymbol;
+    }
+}
+}
diff --git a/src/com/esri/viewer/utils/ErrorMessageUtil.as b/src/com/esri/viewer/utils/ErrorMessageUtil.as
old mode 100644
new mode 100755
index b58dabc..5dd87c7
--- a/src/com/esri/viewer/utils/ErrorMessageUtil.as
+++ b/src/com/esri/viewer/utils/ErrorMessageUtil.as
@@ -52,6 +52,13 @@ public class ErrorMessageUtil
 
         return message;
     }
+
+    public static function makeHTMLSafe(content:String):String
+    {
+        content = content.replace(/>/g, "&gt;");
+        content = content.replace(/</g, "&lt;");
+        return content;
+    }
 }
 
 }
diff --git a/src/com/esri/viewer/utils/GenericJSONTask.as b/src/com/esri/viewer/utils/GenericJSONTask.as
deleted file mode 100644
index d12e7b6..0000000
--- a/src/com/esri/viewer/utils/GenericJSONTask.as
+++ /dev/null
@@ -1,46 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011 Esri. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-///////////////////////////////////////////////////////////////////////////
-package com.esri.viewer.utils
-{
-
-import com.esri.ags.tasks.BaseTask;
-
-import flash.net.URLVariables;
-
-import mx.rpc.AsyncToken;
-import mx.rpc.IResponder;
-
-/**
- * Sends a HTTP request to the url with any additional query parameters specified in the urlVariables.
- * The response is expected to be JSON that is decoded and passed back to the responder's result handler.
- */
-public class GenericJSONTask extends BaseTask
-{
-    public function execute(urlVariables:URLVariables, responder:IResponder):AsyncToken
-    {
-        return sendURLVariables("", urlVariables, responder, handleDecodedObject);
-    }
-
-    private function handleDecodedObject(decodedObject:Object, asyncToken:AsyncToken):void
-    {
-        for each (var responder:IResponder in asyncToken.responders)
-        {
-            responder.result(decodedObject);
-        }
-    }
-}
-
-}
diff --git a/src/com/esri/viewer/utils/GeoRSSUtil.as b/src/com/esri/viewer/utils/GeoRSSUtil.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/utils/Hashtable.as b/src/com/esri/viewer/utils/Hashtable.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/utils/LayerObjectUtil.as b/src/com/esri/viewer/utils/LayerObjectUtil.as
new file mode 100755
index 0000000..aeb938b
--- /dev/null
+++ b/src/com/esri/viewer/utils/LayerObjectUtil.as
@@ -0,0 +1,251 @@
+///////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2012 Esri. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+///////////////////////////////////////////////////////////////////////////
+package com.esri.viewer.utils
+{
+
+import com.esri.ags.clusterers.ESRIClusterer;
+import com.esri.ags.layers.Layer;
+
+public class LayerObjectUtil
+{
+    public static function getLayerObject(obj:XML, num:Number, isOpLayer:Boolean, bingKey:String, layer:Layer = null):Object
+    {
+        var label:String = isOpLayer ? 'OpLayer ' + num : 'Map ' + num; // default label
+        if (obj.@label[0]) // check that label attribute exist
+        {
+            label = obj.@label; // set basemap label if specified in configuration file
+        }
+
+        var type:String;
+        if (!isOpLayer)
+        {
+            type = "tiled"; // default basemap type
+        }
+        if (obj.@type[0]) // check that type attribute exist
+        {
+            type = obj.@type; // set basemap type if specified in configuration file
+        }
+
+        // wms
+        var wkid:String;
+        if (obj.@wkid[0])
+        {
+            wkid = obj.@wkid;
+        }
+
+        var visible:Boolean = obj.@visible == "true";
+
+        var alpha:Number = 1.0;
+        if (obj.@alpha[0])
+        {
+            if (!isNaN(parseFloat(obj.@alpha)))
+            {
+                alpha = parseFloat(obj.@alpha);
+            }
+        }
+
+        var maxAllowableOffset:Number;
+        if (obj.@maxallowableoffset[0])
+        {
+            if (!isNaN(parseFloat(obj.@maxallowableoffset)))
+            {
+                maxAllowableOffset = parseFloat(obj.@maxallowableoffset);
+            }
+        }
+
+        var minScale:Number;
+        if (obj.@minscale[0])
+        {
+            if (!isNaN(parseFloat(obj.@minscale)))
+            {
+                minScale = parseFloat(obj.@minscale);
+            }
+        }
+
+        var maxScale:Number;
+        if (obj.@maxscale[0])
+        {
+            if (!isNaN(parseFloat(obj.@maxscale)))
+            {
+                maxScale = parseFloat(obj.@maxscale);
+            }
+        }
+
+        var maxImageWidth:Number;
+        if (obj.@maximagewidth[0])
+        {
+            if (!isNaN(parseInt(obj.@maximagewidth)))
+            {
+                maxImageWidth = parseInt(obj.@maximagewidth);
+            }
+        }
+
+        var maxImageHeight:Number;
+        if (obj.@maximageheight[0])
+        {
+            if (!isNaN(parseInt(obj.@maximageheight)))
+            {
+                maxImageHeight = parseInt(obj.@maximageheight);
+            }
+        }
+
+        var noData:Number;
+        if (obj.@nodata[0])
+        {
+            if (!isNaN(parseFloat(obj.@nodata)))
+            {
+                noData = parseFloat(obj.@nodata);
+            }
+        }
+
+        var autoRefresh:Number = 0;
+        if (obj.@autorefresh[0])
+        {
+            if (!isNaN(parseInt(obj.@autorefresh)))
+            {
+                autoRefresh = parseInt(obj.@autorefresh);
+            }
+        }
+
+        var clustererParser:ClustererParser = new ClustererParser();
+        var clusterer:ESRIClusterer = clustererParser.parseClusterer(obj.clustering[0]);
+        var useProxy:Boolean = obj.@useproxy[0] && obj.@useproxy == "true"; // default false
+        var useMapTime:Boolean = obj.@usemaptime[0] ? obj.@usemaptime == "true" : true; // default true
+        var useAMF:String = obj.@useamf[0] ? obj.@useamf : "";
+        var token:String = obj.@token[0] ? obj.@token : "";
+        var mode:String = obj.@mode[0] ? obj.@mode : "";
+        var icon:String = isSupportedImageType(obj.@icon[0]) ? obj.@icon : 'assets/images/defaultBasemapIcon.png';
+        var layerId:String = obj.@layerid[0];
+        var imageFormat:String = obj.@imageformat;
+        var visibleLayers:String = obj.@visiblelayers;
+        var displayLevels:String = obj.@displaylevels;
+        var bandIds:String = obj.@bandids;
+        var skipGetCapabilities:String = obj.@skipgetcapabilities[0];
+        var version:String = obj.@version[0];
+        var url:String = obj.@url;
+        var serviceURL:String = obj.@serviceurl[0];
+        var serviceMode:String = obj.@servicemode[0];
+        var username:String = obj.@username;
+        var password:String = obj.@password;
+
+        // ve tiled layer
+        var style:String = obj.@style[0] ? obj.@style : "";
+        var key:String;
+        if (bingKey)
+        {
+            key = bingKey;
+        }
+        else
+        {
+            key = obj.@key[0] ? obj.@key : "";
+        }
+        var culture:String = obj.@culture[0] ? obj.@culture : "";
+
+        // arcims layer
+        var serviceHost:String = obj.@servicehost[0] ? obj.@servicehost : "";
+        var serviceName:String = obj.@servicename[0] ? obj.@servicename : "";
+
+        // definitionExpression for featurelayer
+        var definitionExpression:String = obj.@definitionexpression[0] ? obj.@definitionexpression : "";
+        var gdbVersion:String = obj.@gdbversion[0];
+
+        //sublayers
+        var subLayers:Array = [];
+        if (type == "tiled" || type == "dynamic")
+        {
+            var subLayersList:XMLList = obj.sublayer;
+            for (var i:int = 0; i < subLayersList.length(); i++)
+            {
+                subLayers.push({ id: String(subLayersList[i].@id), info: subLayersList[i].@info, infoConfig: subLayersList[i].@infoconfig, popUpConfig: subLayersList[i].@popupconfig, definitionExpression: String(subLayersList[i].@definitionexpression)});
+            }
+        }
+
+        var resultObject:Object =
+            {
+                id: String(num),
+                alpha: alpha,
+                bandIds: bandIds,
+                autoRefresh: autoRefresh,
+                culture: culture,
+                clusterer: clusterer,
+                definitionExpression: definitionExpression,
+                displayLevels: displayLevels,
+                gdbVersion: gdbVersion,
+                icon: icon,
+                imageFormat: imageFormat,
+                key: key,
+                label: label,
+                layerId: layerId,
+                maxAllowableOffset: maxAllowableOffset,
+                maxImageHeight: maxImageHeight,
+                maxImageWidth: maxImageWidth,
+                minScale: minScale,
+                maxScale: maxScale,
+                mode: mode,
+                noData: noData,
+                password: password,
+                serviceHost: serviceHost,
+                serviceName: serviceName,
+                serviceMode: serviceMode,
+                serviceURL: serviceURL,
+                skipGetCapabilities: skipGetCapabilities,
+                style: style,
+                subLayers: subLayers,
+                token: token,
+                type: type,
+                url: url,
+                useAMF: useAMF,
+                useMapTime: useMapTime,
+                useProxy: useProxy,
+                username: username,
+                version: version,
+                visible: visible,
+                visibleLayers: visibleLayers,
+                wkid: wkid
+            };
+
+        // look for info, infoconfig and popupconfig on basemaps and operational layers
+        var opLayerInfo:String = obj.@info;
+        var opLayerInfoConfig:String = obj.@infoconfig;
+        var opLayerPopUpConfig:String = obj.@popupconfig;
+        resultObject.popUpConfig = opLayerPopUpConfig;
+        resultObject.infoConfig = opLayerInfoConfig;
+        resultObject.infoUrl = opLayerInfo;
+        resultObject.layer = layer;
+        if (!isOpLayer)
+        {
+            var reference:Boolean = obj.@reference[0] && obj.@reference == "true";
+            resultObject.reference = reference;
+        }
+
+        return resultObject;
+    }
+
+    private static function isSupportedImageType(filePath:String):Boolean
+    {
+        var fp:String = filePath;
+        if (!fp)
+        {
+            return false;
+        }
+        var tokenIndex:int = fp.indexOf("?");
+        var hasToken:Boolean = (tokenIndex > -1);
+        fp = hasToken ? fp.substr(0, tokenIndex) : fp;
+        var endsWithSupportedImageFileType:RegExp = /\.(png|gif|jpg)$/i;
+        return endsWithSupportedImageFileType.test(fp);
+    }
+}
+}
diff --git a/src/com/esri/viewer/utils/Namespaces.as b/src/com/esri/viewer/utils/Namespaces.as
old mode 100644
new mode 100755
diff --git a/src/com/esri/viewer/utils/PopUpInfoParser.as b/src/com/esri/viewer/utils/PopUpInfoParser.as
old mode 100644
new mode 100755
index ca91710..76a5105
--- a/src/com/esri/viewer/utils/PopUpInfoParser.as
+++ b/src/com/esri/viewer/utils/PopUpInfoParser.as
@@ -16,10 +16,10 @@
 package com.esri.viewer.utils
 {
 
-import com.esri.ags.webmap.supportClasses.PopUpFieldFormat;
-import com.esri.ags.webmap.supportClasses.PopUpFieldInfo;
-import com.esri.ags.webmap.supportClasses.PopUpInfo;
-import com.esri.ags.webmap.supportClasses.PopUpMediaInfo;
+import com.esri.ags.portal.supportClasses.PopUpFieldFormat;
+import com.esri.ags.portal.supportClasses.PopUpFieldInfo;
+import com.esri.ags.portal.supportClasses.PopUpInfo;
+import com.esri.ags.portal.supportClasses.PopUpMediaInfo;
 
 /**
  * Helper class for parsing pop-up configuration XML file.
diff --git a/src/com/esri/viewer/utils/PortalBasemapAppender.as b/src/com/esri/viewer/utils/PortalBasemapAppender.as
new file mode 100755
index 0000000..c5b7f56
--- /dev/null
+++ b/src/com/esri/viewer/utils/PortalBasemapAppender.as
@@ -0,0 +1,402 @@
+package com.esri.viewer.utils
+{
+
+import com.esri.ags.events.PortalEvent;
+import com.esri.ags.portal.Portal;
+import com.esri.ags.portal.supportClasses.PortalGroup;
+import com.esri.ags.portal.supportClasses.PortalItem;
+import com.esri.ags.portal.supportClasses.PortalQueryParameters;
+import com.esri.ags.portal.supportClasses.PortalQueryResult;
+import com.esri.viewer.AppEvent;
+import com.esri.viewer.ConfigData;
+
+import flash.events.Event;
+import flash.events.EventDispatcher;
+
+import mx.resources.ResourceManager;
+import mx.rpc.AsyncResponder;
+import mx.rpc.Fault;
+import mx.rpc.events.FaultEvent;
+import mx.utils.ObjectUtil;
+
+public class PortalBasemapAppender extends EventDispatcher
+{
+    private const PORTAL_BASEMAP_APPENDER:String = "PortalBasemapAppender";
+
+    private var configData:ConfigData;
+    private var portalURL:String;
+
+    private var itemTitleOrder:Array;
+    private var processedArcGISBasemaps:Array;
+    private var totalBasemaps:int;
+    private var totalPossibleArcGISBasemaps:int;
+
+    private var comparableDefaultBasemapObjects:Array;
+    private var defaultBasemapTitle:String;
+
+    public function PortalBasemapAppender(portalURL:String, configData:ConfigData)
+    {
+        this.portalURL = portalURL;
+        this.configData = configData;
+    }
+
+    public function fetchAndAppendPortalBasemaps():void
+    {
+        var portal:Portal = new Portal();
+        portal.addEventListener(PortalEvent.LOAD, portal_loadedHandler);
+        portal.addEventListener(FaultEvent.FAULT, portal_faultHandler);
+
+        var locale:String = ResourceManager.getInstance().localeChain[0];
+        portal.load(portalURL, toCultureCode(locale));
+    }
+
+    protected function portal_loadedHandler(event:PortalEvent):void
+    {
+        var portal:Portal = event.target as Portal;
+        comparableDefaultBasemapObjects = getComparableBasemapObjects(portal.info.defaultBasemap);
+        var queryParams:PortalQueryParameters = PortalQueryParameters.forQuery(portal.info.basemapGalleryGroupQuery);
+        portal.queryGroups(queryParams, new AsyncResponder(portal_queryGroupsResultHandler, portal_queryGroupsFaultHandler, portal));
+    }
+
+    protected function portal_queryGroupsResultHandler(queryResult:PortalQueryResult, portal:Portal):void
+    {
+        if (queryResult.results.length > 0)
+        {
+            var portalGroup:PortalGroup = queryResult.results[0];
+            var queryParams:PortalQueryParameters = PortalQueryParameters.forItemsInGroup(portalGroup.id).withLimit(50).withSortField("name");
+            portal.queryItems(queryParams, new AsyncResponder(portal_queryItemsResultHandler, portal_queryItemsFaultHandler));
+        }
+        else
+        {
+            dispatchComplete();
+        }
+    }
+
+    private function portal_queryItemsResultHandler(queryResult:PortalQueryResult, token:Object = null):void
+    {
+        var resultItems:Array = queryResult.results;
+        totalPossibleArcGISBasemaps = resultItems.length;
+        itemTitleOrder = [];
+        processedArcGISBasemaps = [];
+        totalBasemaps = configData.basemaps.length;
+        var portalItem:PortalItem;
+        for (var i:uint = 0; i < totalPossibleArcGISBasemaps; i++)
+        {
+            portalItem = resultItems[i];
+            itemTitleOrder.push(portalItem.title);
+            portalItem.getJSONData(new AsyncResponder(portalItem_getJSONDataResultHandler,
+                                                      portalItem_getJSONDataFaultHandler,
+                                                      portalItem));
+        }
+    }
+
+    private function portalItem_getJSONDataResultHandler(itemData:Object, item:PortalItem):void
+    {
+        createBasemapLayerObject(itemData, item);
+        if (isDefaultBasemap(itemData.baseMap))
+        {
+            defaultBasemapTitle = itemData.baseMap.title;
+        }
+        updateTotalArcGISBasemaps();
+    }
+
+    private function createBasemapLayerObject(itemData:Object, item:PortalItem):void
+    {
+        if (!itemData)
+        {
+            return;
+        }
+
+        var basemapObject:Object = itemData.baseMap;
+        var basemapLayerObjects:Array = basemapObject.baseMapLayers;
+        if (!(basemapObject && basemapLayerObjects))
+        {
+            return;
+        }
+
+        var title:String = basemapObject.title;
+        var iconURL:String = item.thumbnailURL;
+        var existingBasemapLayerObject:Object = findBasemapLayerObjectById(title);
+        if (existingBasemapLayerObject)
+        {
+            existingBasemapLayerObject.icon = iconURL;
+            return;
+        }
+
+        var basemapLayerObject:Object = basemapLayerObjects[0];
+        addBasemapLayerObject(baseMapLayerObjectToLayerXML(title,
+                                                           basemapLayerObject,
+                                                           iconURL));
+
+        var totalBaseMapLayers:int = basemapLayerObjects.length;
+        if (totalBaseMapLayers > 1)
+        {
+            basemapLayerObject = basemapLayerObjects[1];
+            addBasemapLayerObject(baseMapLayerObjectToLayerXML(title,
+                                                               basemapLayerObject,
+                                                               iconURL));
+        }
+    }
+
+    private function isDefaultBasemap(basemapObject:Object):Boolean
+    {
+        var comparableBasemapObjects:Array = getComparableBasemapObjects(basemapObject);
+
+        return (ObjectUtil.compare(comparableBasemapObjects, comparableDefaultBasemapObjects) == 0);
+    }
+
+    private function getComparableBasemapObjects(basemapObject:Object):Array
+    {
+        var basemapLayerObjects:Array = basemapObject.baseMapLayers;
+        var comparableBasemapObjects:Array = [];
+        var comparableBasemapLayerObject:Object;
+
+        for each (var basemapLayerObject:Object in basemapLayerObjects)
+        {
+            comparableBasemapLayerObject = {};
+
+            if (basemapLayerObject.url)
+            {
+                comparableBasemapLayerObject.url = basemapLayerObject.url;
+            }
+            if (basemapLayerObject.type)
+            {
+                comparableBasemapLayerObject.type = basemapLayerObject.type;
+            }
+
+            comparableBasemapObjects.push(comparableBasemapLayerObject);
+        }
+
+        return comparableBasemapObjects;
+    }
+
+    private function findBasemapLayerObjectById(id:String):Object
+    {
+        var layerObjectResult:Object;
+
+        var basemapLayerObjects:Array = configData.basemaps;
+        for each (var layerObject:Object in basemapLayerObjects)
+        {
+            if (layerObject.layer && (layerObject.layer.id == id))
+            {
+                layerObjectResult = layerObject;
+                break;
+            }
+        }
+
+        return layerObjectResult;
+    }
+
+    private function updateTotalArcGISBasemaps():void
+    {
+        totalPossibleArcGISBasemaps--;
+        if (totalPossibleArcGISBasemaps == 0)
+        {
+            addArcGISBasemapsToConfig();
+            dispatchComplete();
+        }
+    }
+
+    private function dispatchComplete():void
+    {
+        dispatchEvent(new Event(Event.COMPLETE));
+    }
+
+    private function addArcGISBasemapsToConfig():void
+    {
+        var hasBasemaps:Boolean = (configData.basemaps.length > 0);
+
+        if (!hasBasemaps)
+        {
+            if (defaultBasemapTitle)
+            {
+                setDefaultBasemapVisible();
+            }
+            else
+            {
+                setFirstBasemapVisible();
+            }
+        }
+
+        addBasemapsInOrder();
+    }
+
+    private function setDefaultBasemapVisible():void
+    {
+        for each (var layerObject:Object in processedArcGISBasemaps)
+        {
+            if (defaultBasemapTitle == layerObject.label)
+            {
+                layerObject.visible = true;
+            }
+        }
+    }
+
+    private function setFirstBasemapVisible():void
+    {
+        if (!itemTitleOrder)
+        {
+            return;
+        }
+
+        var firstBasemapLabel:String = itemTitleOrder[0];
+        for each (var layerObject:Object in processedArcGISBasemaps)
+        {
+            if (layerObject.label == firstBasemapLabel)
+            {
+                layerObject.visible = true;
+            }
+        }
+    }
+
+    private function addBasemapsInOrder():void
+    {
+        for each (var itemLabel:String in itemTitleOrder)
+        {
+            for each (var layerObject:Object in processedArcGISBasemaps)
+            {
+                if (layerObject.label == itemLabel)
+                {
+                    configData.basemaps.push(layerObject);
+                }
+            }
+        }
+    }
+
+    private function addBasemapLayerObject(layerXML:XML):void
+    {
+        if (layerXML)
+        {
+            processedArcGISBasemaps.push(LayerObjectUtil.getLayerObject(layerXML,
+                                                                        totalBasemaps++,
+                                                                        false,
+                                                                        configData.bingKey));
+        }
+    }
+
+    private function baseMapLayerObjectToLayerXML(title:String, basemapLayerObject:Object, iconURL:String = null):XML
+    {
+        var layerXML:XML;
+        const url:String = basemapLayerObject.url;
+        const type:String = basemapLayerObject.type;
+
+        if (url)
+        {
+            layerXML = createTiledLayerXML(title, iconURL, url, basemapLayerObject, false);
+        }
+        else if (isAllowedType(type))
+        {
+            layerXML = createNonEsriLayerXML(title, iconURL, basemapLayerObject, false, type);
+        }
+
+        return layerXML;
+    }
+
+    private function createTiledLayerXML(title:String, iconURL:String, url:String, basemapLayerObject:Object, visible:Boolean):XML
+    {
+        var layerXML:XML = <layer label={title}
+                type="tiled"
+                icon={iconURL}
+                url={url}
+                alpha={basemapLayerObject.opacity}
+                visible={visible}/>;
+
+        return layerXML;
+    }
+
+    private function isAllowedType(type:String):Boolean
+    {
+        return type == "OpenStreetMap" ||
+            (isBingBasemap(type) && hasBingKey());
+    }
+
+    private function createNonEsriLayerXML(title:String, iconURL:String, basemapLayerObject:Object, visible:Boolean, type:String):XML
+    {
+        var layerXML:XML = <layer label={title}
+                icon={iconURL}
+                type={toViewerNonEsriLayerType(basemapLayerObject.type)}
+                alpha={basemapLayerObject.opacity}
+                visible={visible}/>;
+
+        if (isBingBasemap(type))
+        {
+            layerXML.@style = mapBingStyleFromBasemapType(type);
+        }
+
+        return layerXML;
+    }
+
+    private function toViewerNonEsriLayerType(type:String):String
+    {
+        var viewerType:String;
+        if (type == "OpenStreetMap")
+        {
+            viewerType = "osm";
+        }
+        else if (isBingBasemap(type))
+        {
+            viewerType = "bing";
+        }
+
+        return viewerType;
+    }
+
+    private function isBingBasemap(type:String):Boolean
+    {
+        return type && type.indexOf('BingMaps') > -1;
+    }
+
+    private function hasBingKey():Boolean
+    {
+        var bingKey:String = configData.bingKey;
+        return (bingKey != null && bingKey.length > 0);
+    }
+
+    private function mapBingStyleFromBasemapType(type:String):String
+    {
+        if (type == 'BingMapsAerial')
+        {
+            return 'aerial';
+        }
+        else if (type == 'BingMapsHybrid')
+        {
+            return 'aerialWithLabels';
+        }
+        else
+        {
+            //default - BingMapsRoad
+            return 'road';
+        }
+    }
+
+    private function portalItem_getJSONDataFaultHandler(fault:Fault, token:Object = null):void
+    {
+        var errorMessage:String = 'Could not fetch basemap data\n' + fault.faultString;
+        AppEvent.dispatch(AppEvent.APP_ERROR, errorMessage);
+        updateTotalArcGISBasemaps();
+    }
+
+    private function portal_queryGroupsFaultHandler(fault:Fault, token:Object = null):void
+    {
+        AppEvent.showError("Could not query portal.", PORTAL_BASEMAP_APPENDER);
+        dispatchComplete();
+    }
+
+    private function portal_queryItemsFaultHandler(fault:Fault, token:Object = null):void
+    {
+        AppEvent.showError("Could not query portal items.", PORTAL_BASEMAP_APPENDER);
+        dispatchComplete();
+    }
+
+    private function portal_faultHandler(event:FaultEvent):void
+    {
+        AppEvent.showError("Could not connect to Portal.", PORTAL_BASEMAP_APPENDER);
+        dispatchComplete();
+    }
+
+    private function toCultureCode(locale:String):String
+    {
+        return locale.replace('_', '-');
+    }
+}
+}
diff --git a/src/config-all.xml b/src/config-all.xml
old mode 100644
new mode 100755
index 94e423a..9c834ff
--- a/src/config-all.xml
+++ b/src/config-all.xml
@@ -25,18 +25,7 @@
     <widget left="0" top="0" config="widgets/HeaderController/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
     <widget left="3" bottom="3" config="widgets/Coordinate/CoordinateWidget.xml" url="widgets/Coordinate/CoordinateWidget.swf"/>
 
-    <map wraparound180="true" initialextent="-14083000 3139000 -10879000 5458000" fullextent="-20000000 -20000000 20000000 20000000" top="40">
-        <basemaps>
-            <layer label="Streets" type="tiled" visible="true"
-                   icon="assets/images/basemap_streets.jpg"
-                   url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"/>
-            <layer label="Aerial"  type="tiled" visible="false"
-                   icon="assets/images/basemap_imagery.jpg"
-                   url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"/>
-            <layer label="Topo"    type="tiled" visible="false"
-                   icon="assets/images/basemap_topographic.jpg"
-                   url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"/>
-        </basemaps>
+    <map wraparound180="true" initialextent="-14083000 3139000 -10879000 5458000" fullextent="-20000000 -20000000 20000000 20000000" top="40" addarcgisbasemaps="true">
         <operationallayers>
             <!-- Example of editable feature layer -->
             <layer label="San Francisco 3-1-1 Incidents" type="feature" visible="false" alpha="1.0"
diff --git a/src/config.xml b/src/config.xml
old mode 100644
new mode 100755
index 414e08c..bf8f1de
--- a/src/config.xml
+++ b/src/config.xml
@@ -23,18 +23,7 @@
     <widget right="20" top="55"    config="widgets/MapSwitcher/MapSwitcherWidget.xml" url="widgets/MapSwitcher/MapSwitcherWidget.swf"/>
     <widget left="0"   top="0"     config="widgets/HeaderController/HeaderControllerWidget.xml" url="widgets/HeaderController/HeaderControllerWidget.swf"/>
 
-    <map wraparound180="true" initialextent="-14083000 3139000 -10879000 5458000" fullextent="-20000000 -20000000 20000000 20000000" top="40">
-        <basemaps>
-            <layer label="Streets" type="tiled" visible="true"
-                   icon="assets/images/basemap_streets.jpg"
-                   url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"/>
-            <layer label="Aerial"  type="tiled" visible="false"
-                   icon="assets/images/basemap_imagery.jpg"
-                   url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"/>
-            <layer label="Topo"    type="tiled" visible="false"
-                   icon="assets/images/basemap_topographic.jpg"
-                   url="http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"/>
-        </basemaps>
+    <map wraparound180="true" initialextent="-14083000 3139000 -10879000 5458000" fullextent="-20000000 -20000000 20000000 20000000" top="40" addarcgisbasemaps="true">
         <operationallayers>
             <layer label="Demographics" type="tiled" visible="false" alpha="0.5"
                    url="http://server.arcgisonline.com/ArcGIS/rest/services/Demographics/USA_Median_Household_Income/MapServer">
diff --git a/src/defaults.css b/src/defaults.css
old mode 100644
new mode 100755
diff --git a/src/index.mxml b/src/index.mxml
old mode 100644
new mode 100755
index ce8d059..9228d82
--- a/src/index.mxml
+++ b/src/index.mxml
@@ -20,7 +20,6 @@
                xmlns:s="library://ns.adobe.com/flex/spark"
                xmlns:viewer="com.esri.viewer.*"
                xmlns:managers="com.esri.viewer.managers.*"
-               initialize="this_initializeHandler(event)"
                pageTitle="ArcGIS Viewer for Flex">
 
     <fx:Style source="defaults.css"/>
@@ -29,20 +28,6 @@
         [ResourceBundle("ViewerStrings")]
     </fx:Metadata>
 
-    <fx:Script>
-        <![CDATA[
-            import com.esri.ags.components.IdentityManager;
-
-            import mx.events.FlexEvent;
-
-            protected function this_initializeHandler(event:FlexEvent):void
-            {
-                // enable the Identity manager
-                IdentityManager.instance.enabled = true;
-            }
-        ]]>
-    </fx:Script>
-
     <viewer:ViewerContainer id="viewerContainer">
         <viewer:configManager>
             <managers:ConfigManager id="configManager"/>
diff --git a/src/license.txt b/src/license.txt
old mode 100644
new mode 100755
diff --git a/src/popups/PopUp_311.xml b/src/popups/PopUp_311.xml
old mode 100644
new mode 100755
diff --git a/src/popups/PopUp_Demographics_BlockGroups.xml b/src/popups/PopUp_Demographics_BlockGroups.xml
old mode 100644
new mode 100755
diff --git a/src/popups/PopUp_Demographics_Counties.xml b/src/popups/PopUp_Demographics_Counties.xml
old mode 100644
new mode 100755
diff --git a/src/popups/PopUp_Demographics_States.xml b/src/popups/PopUp_Demographics_States.xml
old mode 100644
new mode 100755
diff --git a/src/popups/PopUp_Demographics_Tracts.xml b/src/popups/PopUp_Demographics_Tracts.xml
old mode 100644
new mode 100755
diff --git a/src/popups/PopUp_Fires.xml b/src/popups/PopUp_Fires.xml
old mode 100644
new mode 100755
diff --git a/src/popups/PopUp_Hurricanes.xml b/src/popups/PopUp_Hurricanes.xml
old mode 100644
new mode 100755
diff --git a/src/popups/PopUp_IncidentAreas.xml b/src/popups/PopUp_IncidentAreas.xml
old mode 100644
new mode 100755
diff --git a/src/popups/PopUp_IncidentPoints.xml b/src/popups/PopUp_IncidentPoints.xml
old mode 100644
new mode 100755
diff --git a/src/version.xml b/src/version.xml
old mode 100644
new mode 100755
index d91e2b5..da9a25b
--- a/src/version.xml
+++ b/src/version.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0"?>
-<esrifv apiversion="3.0Prerelease"
-    builddate="2012-03-15"/>
+<esrifv apiversion="3.001" builddate="2012-06-06"/>
diff --git a/src/widgets/Bookmark/Bookmark.as b/src/widgets/Bookmark/Bookmark.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Bookmark/BookmarkDataGroup.as b/src/widgets/Bookmark/BookmarkDataGroup.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Bookmark/BookmarkItemRenderer.mxml b/src/widgets/Bookmark/BookmarkItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Bookmark/BookmarkWidget.mxml b/src/widgets/Bookmark/BookmarkWidget.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Bookmark/BookmarkWidget.xml b/src/widgets/Bookmark/BookmarkWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Chart/ChartBrowser.as b/src/widgets/Chart/ChartBrowser.as
old mode 100644
new mode 100755
index 93a44c8..504fb29
--- a/src/widgets/Chart/ChartBrowser.as
+++ b/src/widgets/Chart/ChartBrowser.as
@@ -18,7 +18,7 @@ package widgets.Chart
 {
 
 import com.esri.ags.skins.supportClasses.PopUpMediaBrowser;
-import com.esri.ags.webmap.supportClasses.PopUpMediaInfo;
+import com.esri.ags.portal.supportClasses.PopUpMediaInfo;
 
 public class ChartBrowser extends PopUpMediaBrowser
 {
@@ -30,6 +30,9 @@ public class ChartBrowser extends PopUpMediaBrowser
     public var count:Number;
     public var average:Number;
 
+    [Bindable]
+    public var precision:int = -1;
+
     override public function getChartData():Array
     {
         var result:Array;
diff --git a/src/widgets/Chart/ChartBrowserSkin.mxml b/src/widgets/Chart/ChartBrowserSkin.mxml
old mode 100644
new mode 100755
index 0d9a874..c15ecf1
--- a/src/widgets/Chart/ChartBrowserSkin.mxml
+++ b/src/widgets/Chart/ChartBrowserSkin.mxml
@@ -10,7 +10,7 @@
     <fx:Script>
         <![CDATA[
             import com.esri.ags.utils.StringUtil;
-            import com.esri.ags.webmap.supportClasses.PopUpMediaInfo;
+            import com.esri.ags.portal.supportClasses.PopUpMediaInfo;
 
             import mx.core.IVisualElement;
 
@@ -45,7 +45,7 @@
                     showOrHideCount();
 
                     // show caption
-                    var captionText:String = insertStatsIfKeywordsPresent(mediaInfo.caption);
+                    var captionText:String = insertStats(mediaInfo.caption);
                     captionLabel.text = StringUtil.substitute(captionText, formattedAttributes);
                 }
             }
@@ -124,7 +124,7 @@
                 }
             }
 
-            private function insertStatsIfKeywordsPresent(text:String):String
+            private function insertStats(text:String):String
             {
                 var sumKeywordRE:RegExp = /{=SUM}/;
                 var minKeywordRE:RegExp = /{=MIN}/;
@@ -132,17 +132,27 @@
                 var countKeywordRE:RegExp = /{=COUNT}/;
                 var averageKeywordRE:RegExp = /{=AVERAGE}/;
 
-                text = text.replace(sumKeywordRE, hostComponent.sum);
-                text = text.replace(minKeywordRE, hostComponent.min);
-                text = text.replace(maxKeywordRE, hostComponent.max);
-                text = text.replace(countKeywordRE, hostComponent.count);
-                text = text.replace(averageKeywordRE, hostComponent.average);
+                text = insertStatistic(text, sumKeywordRE, hostComponent.sum);
+                text = insertStatistic(text, minKeywordRE, hostComponent.min);
+                text = insertStatistic(text, maxKeywordRE, hostComponent.max);
+                text = insertStatistic(text, countKeywordRE, hostComponent.count);
+                text = insertStatistic(text, averageKeywordRE, hostComponent.average);
 
                 return text;
             }
+
+            private function insertStatistic(source:String, keyword:RegExp, insertionValue:Number):String
+            {
+                var finalInsertionValue:String = (hostComponent.precision > -1) ? numberFormatter.format(insertionValue) : insertionValue.toString();
+                return source.replace(keyword, finalInsertionValue);
+            }
         ]]>
     </fx:Script>
 
+    <fx:Declarations>
+        <s:NumberFormatter id="numberFormatter" fractionalDigits="{hostComponent.precision}"/>
+    </fx:Declarations>
+
     <s:layout>
         <s:VerticalLayout/>
     </s:layout>
diff --git a/src/widgets/Chart/ChartLayerDefinition.as b/src/widgets/Chart/ChartLayerDefinition.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Chart/ChartWidget.mxml b/src/widgets/Chart/ChartWidget.mxml
old mode 100644
new mode 100755
index 97b81d1..845b5fa
--- a/src/widgets/Chart/ChartWidget.mxml
+++ b/src/widgets/Chart/ChartWidget.mxml
@@ -32,18 +32,17 @@
             import com.esri.ags.geometry.Geometry;
             import com.esri.ags.layers.FeatureLayer;
             import com.esri.ags.layers.Layer;
+            import com.esri.ags.portal.supportClasses.PopUpFieldInfo;
+            import com.esri.ags.portal.supportClasses.PopUpMediaInfo;
             import com.esri.ags.symbols.SimpleFillSymbol;
             import com.esri.ags.symbols.SimpleLineSymbol;
             import com.esri.ags.symbols.Symbol;
             import com.esri.ags.tasks.supportClasses.Query;
             import com.esri.ags.tools.DrawTool;
-            import com.esri.ags.webmap.supportClasses.PopUpFieldInfo;
-            import com.esri.ags.webmap.supportClasses.PopUpMediaInfo;
             import com.esri.viewer.utils.PopUpInfoParser;
 
             import mx.collections.ArrayCollection;
             import mx.collections.ArrayList;
-            import mx.core.FlexVersion;
             import mx.events.FlexEvent;
             import mx.rpc.events.FaultEvent;
 
@@ -95,35 +94,30 @@
 
             private var selectedChartLayerDefinition:ChartLayerDefinition;
             private var sourceFeatureLayer:FeatureLayer;
-            private var isSourceLayerVisible:Boolean;
-            private var isSourceLayerInScaleRange:Boolean;
 
             private function basewidget_preinitializeHandler(event:FlexEvent):void
             {
-                if (FlexVersion.CURRENT_VERSION >= 0x04060000)
-                {
-                    // work-around for 4.6 regression
-                    copyStyleFromParent("mx.charts.chartClasses.ChartBase");
-                    copyStyleFromParent("mx.charts.chartClasses.CartesianChart");
-                    copyStyleFromParent("mx.charts.chartClasses.PolarChart");
-                    copyStyleFromParent("mx.charts.BarChart");
-                    copyStyleFromParent("mx.charts.ColumnChart");
-                    copyStyleFromParent("mx.charts.LineChart");
-                    copyStyleFromParent("mx.charts.PieChart");
-                    copyStyleFromParent("mx.charts.AxisRenderer");
-                    copyStyleFromParent(".blockCategoryAxis");
-                    copyStyleFromParent(".blockNumericAxis");
-                    copyStyleFromParent(".linedNumericAxis");
-                    copyStyleFromParent(".dashedNumericAxis");
-                    copyStyleFromParent(".dashedCategoryAxis");
-                    copyStyleFromParent(".hangingCategoryAxis");
-                    copyStyleFromParent("mx.charts.GridLines");
-                    copyStyleFromParent(".horizontalGridLines");
-                    copyStyleFromParent("mx.charts.series.BarSeries");
-                    copyStyleFromParent("mx.charts.series.ColumnSeries");
-                    copyStyleFromParent("mx.charts.series.LineSeries");
-                    copyStyleFromParent("mx.charts.series.PieSeries");
-                }
+                // work-around for 4.6 regression
+                copyStyleFromParent("mx.charts.chartClasses.ChartBase");
+                copyStyleFromParent("mx.charts.chartClasses.CartesianChart");
+                copyStyleFromParent("mx.charts.chartClasses.PolarChart");
+                copyStyleFromParent("mx.charts.BarChart");
+                copyStyleFromParent("mx.charts.ColumnChart");
+                copyStyleFromParent("mx.charts.LineChart");
+                copyStyleFromParent("mx.charts.PieChart");
+                copyStyleFromParent("mx.charts.AxisRenderer");
+                copyStyleFromParent(".blockCategoryAxis");
+                copyStyleFromParent(".blockNumericAxis");
+                copyStyleFromParent(".linedNumericAxis");
+                copyStyleFromParent(".dashedNumericAxis");
+                copyStyleFromParent(".dashedCategoryAxis");
+                copyStyleFromParent(".hangingCategoryAxis");
+                copyStyleFromParent("mx.charts.GridLines");
+                copyStyleFromParent(".horizontalGridLines");
+                copyStyleFromParent("mx.charts.series.BarSeries");
+                copyStyleFromParent("mx.charts.series.ColumnSeries");
+                copyStyleFromParent("mx.charts.series.LineSeries");
+                copyStyleFromParent("mx.charts.series.PieSeries");
             }
 
             private function copyStyleFromParent(selector:String):void
@@ -146,6 +140,12 @@
                     initChartLayerOptions(configXML.layers.layer);
                     configureLabels(configXML.labels);
                     highlightColor = parseInt(configXML.highlightcolor[0]) || 0xFFFF00;
+                    if (configXML.statistics.@precision[0])
+                    {
+                        var precision:Number = parseInt(configXML.statistics.@precision[0]);
+                        chartBrowser.precision = isNaN(precision) ? -1 : precision;
+                    }
+
                     configureViewTitlebarButtons();
                     map.addEventListener(KeyboardEvent.KEY_UP, keyUpHandler);
                     map.addEventListener(KeyboardEvent.KEY_DOWN, keyDownHandler);
@@ -264,7 +264,7 @@
                 drawToolMenuLabel = labels.drawtoolmenulabel[0] || getDefaultString("drawToolMenuLabel");
                 noLayersLabel = labels.nolayerslabel[0] || getDefaultString("noLayersLabel");
                 noChartDataToDisplayLabel = labels.nochartdatatodisplaylabel[0] || getDefaultString("noChartDataToDisplayLabel");
-                layerSourceNotVisibleLabel = labels.featurelayernotvisibletext || getDefaultString("featureLayerNotVisibleText");
+                layerSourceNotVisibleLabel = labels.featurelayernotvisibletext[0] || getDefaultString("featureLayerNotVisibleText");
 
                 polygonLabel = labels.polygonlabel[0] || getDefaultString("drawPolygonLabel");
                 freehandPolygonLabel = labels.freehandpolygonlabel[0] || getDefaultString("drawFreehandPolygonLabel");
@@ -550,6 +550,7 @@
             private function updateSelectedChartLayerDefinition():void
             {
                 selectedChartLayerDefinition = (layerSelection.selectedItem as ChartLayerDefinition);
+                removeSourceLayerListeners();
                 if (!selectedChartLayerDefinition.url)
                 {
                     sourceFeatureLayer = findFeatureLayerByLabel(selectedChartLayerDefinition.label);
@@ -561,46 +562,47 @@
                     sourceFeatureLayer = null;
                     highlightFeatureLayer.url = selectedChartLayerDefinition.url;
                 }
+                addSourceLayerListeners();
             }
 
-            private function updateHighlightFeatureLayerInclusion():void
+            private function removeSourceLayerListeners():void
             {
                 if (sourceFeatureLayer)
                 {
-                    isHighlightFeatureLayerShown = (sourceFeatureLayer.visible && sourceFeatureLayer.isInScaleRange);
-                }
-                else
-                {
-                    isHighlightFeatureLayerShown = highlightFeatureLayer.isInScaleRange;
+                    sourceFeatureLayer.removeEventListener(FlexEvent.SHOW, selectedLayer_showHandler);
+                    sourceFeatureLayer.removeEventListener(FlexEvent.HIDE, selectedLayer_hideHandler);
                 }
             }
 
-            private function removeLayerListeners():void
+            private function updateHighlightFeatureLayerInclusion():void
             {
                 if (sourceFeatureLayer)
                 {
-                    sourceFeatureLayer.removeEventListener(LayerEvent.IS_IN_SCALE_RANGE_CHANGE, selectedLayer_isInScaleRangeChangeHandler);
-                    sourceFeatureLayer.removeEventListener(FlexEvent.SHOW, selectedLayer_showHandler);
-                    sourceFeatureLayer.removeEventListener(FlexEvent.HIDE, selectedLayer_hideHandler);
+                    isHighlightFeatureLayerShown = (sourceFeatureLayer.visible && sourceFeatureLayer.isInScaleRange);
+                }
+                else
+                {
+                    isHighlightFeatureLayerShown = highlightFeatureLayer.isInScaleRange;
                 }
             }
 
-            private function selectedLayer_isInScaleRangeChangeHandler(event:LayerEvent):void
+            private function selectedLayer_showHandler(event:FlexEvent):void
             {
-                isSourceLayerInScaleRange = event.isInScaleRange;
                 updateHighlightFeatureLayerInclusion();
             }
 
-            private function selectedLayer_showHandler():void
+            private function selectedLayer_hideHandler(event:FlexEvent):void
             {
-                isSourceLayerVisible = true;
                 updateHighlightFeatureLayerInclusion();
             }
 
-            private function selectedLayer_hideHandler():void
+            private function addSourceLayerListeners():void
             {
-                isSourceLayerVisible = false;
-                updateHighlightFeatureLayerInclusion();
+                if (sourceFeatureLayer)
+                {
+                    sourceFeatureLayer.addEventListener(FlexEvent.SHOW, selectedLayer_showHandler);
+                    sourceFeatureLayer.addEventListener(FlexEvent.HIDE, selectedLayer_hideHandler);
+                }
             }
         ]]>
     </fx:Script>
diff --git a/src/widgets/Chart/ChartWidget.xml b/src/widgets/Chart/ChartWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Coordinate/CoordinateWidget.mxml b/src/widgets/Coordinate/CoordinateWidget.mxml
old mode 100644
new mode 100755
index 0f0c9ae..6bbcb61
--- a/src/widgets/Coordinate/CoordinateWidget.mxml
+++ b/src/widgets/Coordinate/CoordinateWidget.mxml
@@ -30,7 +30,6 @@
             import com.esri.ags.utils.WebMercatorUtil;
 
             import mx.formatters.NumberBaseRoundType;
-            import mx.utils.ColorUtil;
             import mx.utils.StringUtil;
 
             private var m_template:String;
@@ -40,26 +39,26 @@
             {
                 if (configXML)
                 {
-                    const decimalSeparator:String = configXML.numberformatter.@decimalseparator
-                    numberFormatter.decimalSeparatorTo = decimalSeparator.length ? decimalSeparator : ".";
+                    const decimalSeparator:String = configXML.numberformatter.@decimalseparator;
+                    numberFormatter.decimalSeparatorTo = decimalSeparator ? decimalSeparator : ".";
                     const thousandsSeparator:String = configXML.numberformatter.@thousandsseparator;
-                    numberFormatter.thousandsSeparatorTo = thousandsSeparator.length ? thousandsSeparator : ",";
+                    numberFormatter.thousandsSeparatorTo = thousandsSeparator ? thousandsSeparator : ",";
                     numberFormatter.useThousandsSeparator = configXML.numberformatter.@usethousandsseparator == "true";
                     numberFormatter.precision = parseFloat(configXML.numberformatter.@precision || "-1");
                     const rounding:String = configXML.numberformatter.@rounding;
-                    numberFormatter.rounding = rounding.length ? rounding : NumberBaseRoundType.NONE;
+                    numberFormatter.rounding = rounding ? rounding : NumberBaseRoundType.NONE;
 
-                    const color:String = configXML.label.@color;
-                    coords.setStyle("color", toNumber(color.length ? color : "0x000000"));
-                    const fontFamily:String = configXML.label.@fontfamily;
-                    coords.setStyle("fontFamily", fontFamily.length ? fontFamily : "Verdana");
-                    const fontSize:String = configXML.label.@fontsize;
-                    coords.setStyle("fontSize", parseInt(fontSize.length ? fontSize : "9"));
-                    const fontWeight:String = configXML.label.@fontweight;
-                    coords.setStyle("fontWeight", fontWeight.length ? fontWeight : "bold");
+                    const color:String = configXML.labelstyle.@color[0] || configXML.label.@color[0];
+                    coords.setStyle("color", toNumber(color ? color : "0x000000"));
+                    const fontFamily:String = configXML.labelstyle.@fontfamily[0] || configXML.label.@fontfamily[0];
+                    coords.setStyle("fontFamily", fontFamily ? fontFamily : "Verdana");
+                    const fontSize:String = configXML.labelstyle.@fontsize[0] || configXML.label.@fontsize[0];
+                    coords.setStyle("fontSize", parseInt(fontSize ? fontSize : "9"));
+                    const fontWeight:String = configXML.labelstyle.@fontweight[0] || configXML.label.@fontweight[0];
+                    coords.setStyle("fontWeight", fontWeight ? fontWeight : "bold");
 
                     // If no template specified, show them with a space in between (except for special case below)
-                    m_template = configXML.label.@template || "{0} {1}";
+                    m_template = configXML.labels.template[0] || configXML.label.@template[0] || "{0} {1}";
 
                     if (map.loaded)
                     {
@@ -90,13 +89,13 @@
                         {
                             m_func = mercatorToGeographic;
                             // special default for geographic outputs
-                            m_template = configXML.label.@template || getDefaultString("latitudeLabel") + ":{1}   " + getDefaultString("longitudeLabel") + ":{0}";
+                            m_template = configXML.labels.template[0] || configXML.label.@template[0] || getDefaultString("latitudeLabel") + ":{1}   " + getDefaultString("longitudeLabel") + ":{0}";
                             numberFormatter.precision = parseFloat(configXML.numberformatter.@precision || "6");
                         }
                         else if (wkid === 4326 || wkid === 4269 || wkid === 4267)
                         {
                             // special default for geographic outputs
-                            m_template = configXML.label.@template || getDefaultString("latitudeLabel") + ":{1}   " + getDefaultString("longitudeLabel") + ":{0}";
+                            m_template = configXML.labels.template[0] || configXML.label.@template[0] || getDefaultString("latitudeLabel") + ":{1}   " + getDefaultString("longitudeLabel") + ":{0}";
                             numberFormatter.precision = parseFloat(configXML.numberformatter.@precision || "6");
                         }
                     }
diff --git a/src/widgets/Coordinate/CoordinateWidget.xml b/src/widgets/Coordinate/CoordinateWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Coordinate/DegToDMS.as b/src/widgets/Coordinate/DegToDMS.as
old mode 100644
new mode 100755
diff --git a/src/widgets/DataExtract/DataExtractWidget.mxml b/src/widgets/DataExtract/DataExtractWidget.mxml
old mode 100644
new mode 100755
index 2ddebf8..a7f63e0
--- a/src/widgets/DataExtract/DataExtractWidget.mxml
+++ b/src/widgets/DataExtract/DataExtractWidget.mxml
@@ -38,6 +38,7 @@
             import com.esri.ags.symbols.Symbol;
             import com.esri.ags.tasks.GeometryService;
             import com.esri.ags.tasks.GeometryServiceSingleton;
+            import com.esri.ags.tasks.JSONTask;
             import com.esri.ags.tasks.supportClasses.GPMessage;
             import com.esri.ags.tasks.supportClasses.JobInfo;
             import com.esri.ags.tools.DrawTool;
@@ -46,7 +47,6 @@
             import com.esri.ags.utils.GraphicUtil;
             import com.esri.viewer.AppEvent;
             import com.esri.viewer.utils.ErrorMessageUtil;
-            import com.esri.viewer.utils.GenericJSONTask;
 
             import mx.collections.ArrayCollection;
             import mx.controls.Alert;
@@ -61,7 +61,7 @@
             private var finishDrawing:Boolean;
             private var graphicsLayer:GraphicsLayer;
             private var graphicContextMenu:ContextMenu;
-            private var gpService:GenericJSONTask;
+            private var gpService:JSONTask;
             private var selectedDrawingIcon:Image;
 
             private var drawSymbol:Symbol;
@@ -144,7 +144,7 @@
                         useProxy = configXML.useproxy == "true";
                     }
 
-                    gpService = new GenericJSONTask();
+                    gpService = new JSONTask();
                     gpService.url = gpURL;
                     if (useProxy && configData.proxyUrl)
                     {
@@ -211,13 +211,6 @@
                 graphicsLayer.remove(graphic);
             }
 
-            private function makeHTMLSafe(content:String):String
-            {
-                content = content.replace(/>/g, "&gt;");
-                content = content.replace(/</g, "&lt;");
-                return content;
-            }
-
             private function callGPService():void
             {
                 var geometries:Array = getInputGeometries();
@@ -676,7 +669,7 @@
                     + "Most likely cause:\n"
                     + ErrorMessageUtil.getKnownErrorCauseMessage(fault.faultCode) + "\n\n"
                     + "Details:\n"
-                    + makeHTMLSafe(fault.toString());
+                    + ErrorMessageUtil.makeHTMLSafe(fault.toString());
                 showError(msg);
                 widgetVBox.enabled = false;
             }
diff --git a/src/widgets/DataExtract/DataExtractWidget.xml b/src/widgets/DataExtract/DataExtractWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Draw/DrawWidget.mxml b/src/widgets/Draw/DrawWidget.mxml
old mode 100644
new mode 100755
index f2c82bf..82b2ccb
--- a/src/widgets/Draw/DrawWidget.mxml
+++ b/src/widgets/Draw/DrawWidget.mxml
@@ -1094,6 +1094,7 @@
                 gra.symbol = txtSym;
                 gra.mouseEnabled = false;
                 gra.mouseChildren = false;
+                gra.filters = [ measurementBorderFilter ];
                 graphicsLayer.add(gra);
             }
 
@@ -1142,6 +1143,11 @@
                       color="{getStyle('focusColor')}"
                       inner="true"
                       strength="2"/>
+        <s:GlowFilter id="measurementBorderFilter"
+                      blurX="3"
+                      blurY="3"
+                      color="0xFFFFFF"
+                      strength="7"/>
         <esri:GeometryService id="geometryService"
                               fault="geometryService_faultHandler(event)"
                               projectComplete="geometryService_projectCompleteHandler(event)"
@@ -1353,7 +1359,8 @@
                                     <fx:Object name="{getDefaultString('markerStyleCross')}" style="{SimpleMarkerSymbol.STYLE_CROSS}"/>
                                     <fx:Object name="{getDefaultString('markerStyleDiamond')}" style="{SimpleMarkerSymbol.STYLE_DIAMOND}"/>
                                     <fx:Object name="{getDefaultString('markerStyleSquare')}" style="{SimpleMarkerSymbol.STYLE_SQUARE}"/>
-                                    <fx:Object name="{getDefaultString('markerStyleTriangle')}" style="{SimpleMarkerSymbol.STYLE_TRIANGLE}"/>
+                                    <!-- triangle style is not supported by the 10.1 print task -->
+                                    <!--<fx:Object name="{getDefaultString('markerStyleTriangle')}" style="{SimpleMarkerSymbol.STYLE_TRIANGLE}"/>-->
                                     <fx:Object name="{getDefaultString('markerStyleX')}" style="{SimpleMarkerSymbol.STYLE_X}"/>
                                 </s:ArrayList>
                             </s:DropDownList>
diff --git a/src/widgets/Draw/DrawWidget.xml b/src/widgets/Draw/DrawWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Edit/EditWidget.mxml b/src/widgets/Edit/EditWidget.mxml
old mode 100644
new mode 100755
index 72a3f76..92e2a1f
--- a/src/widgets/Edit/EditWidget.mxml
+++ b/src/widgets/Edit/EditWidget.mxml
@@ -39,7 +39,7 @@
     <fx:Script>
         <![CDATA[
             import com.esri.ags.Graphic;
-            import com.esri.ags.components.IdentityManager;
+            import com.esri.ags.components.AttributeInspector;
             import com.esri.ags.events.AttributeInspectorEvent;
             import com.esri.ags.events.FeatureLayerEvent;
             import com.esri.ags.events.LayerEvent;
@@ -49,11 +49,13 @@
             import com.esri.ags.layers.FeatureLayer;
             import com.esri.ags.layers.GraphicsLayer;
             import com.esri.ags.layers.Layer;
+            import com.esri.ags.layers.supportClasses.FeatureLayerDetails;
+            import com.esri.ags.layers.supportClasses.FeatureTableDetails;
             import com.esri.ags.layers.supportClasses.Field;
             import com.esri.ags.layers.supportClasses.LayerInfo;
             import com.esri.ags.skins.supportClasses.AttachmentMouseEvent;
             import com.esri.ags.tasks.GeometryServiceSingleton;
-            import com.esri.ags.utils.JSONUtil;
+            import com.esri.ags.tasks.JSONTask;
             import com.esri.viewer.AppEvent;
 
             import mx.binding.utils.ChangeWatcher;
@@ -62,10 +64,7 @@
             import mx.events.CollectionEvent;
             import mx.events.FlexEvent;
             import mx.rpc.AsyncResponder;
-            import mx.rpc.AsyncToken;
-            import mx.rpc.events.FaultEvent;
-            import mx.rpc.events.ResultEvent;
-            import mx.rpc.http.HTTPService;
+            import mx.rpc.Fault;
 
             [Bindable]
             private var oplList:Array;
@@ -187,45 +186,14 @@
                     }
                     editor.updateGeometryEnabled = updateGeometry;
 
-                    // showCreatorField
-                    if (configXML.showcreatorfield.length() > 0)
+                    // formFieldsOrder
+                    if (configXML.formfieldsorder.length() > 0)
                     {
-                        editor.attributeInspector.showCreatorField = configXML.showcreatorfield == "true";
-                    }
-
-                    // showCreationDateField
-                    if (configXML.showcreationdatefield.length() > 0)
-                    {
-                        editor.attributeInspector.showCreationDateField = configXML.showcreationdatefield == "true";
-                    }
-
-                    // showEditorField
-                    if (configXML.showeditorfield.length() > 0)
-                    {
-                        editor.attributeInspector.showEditorField = configXML.showeditorfield == "true";
-                    }
-
-                    // showEditDateField
-                    if (configXML.showeditdatefield.length() > 0)
-                    {
-                        editor.attributeInspector.showEditDateField = configXML.showeditdatefield == "true";
+                        editor.attributeInspector.formFieldsOrder = toAttributeInspectorFormFieldsOrder(configXML.formfieldsorder);
                     }
 
                     //labels
-                    attributesLabel = configXML.labels.attributeslabel[0] || getDefaultString("attributesLabel");
-                    attachmentsLabel = configXML.labels.attachmentslabel[0] || getDefaultString("attachmentsLabel");
-
-                    noEditableLayersText = configXML.noeditablelayerstext || getDefaultString("noEditableLayersText");
-                    EditWidgetTemplatePickerSkin.featureLayerNotVisibleText = configXML.featurelayernotvisibletext || getDefaultString("featureLayerNotVisibleText");
-                    EditWidgetAttributeInspectorSkin.showAttachmentsText = configXML.showattachmentstext || getDefaultString("showAttachmentsText");
-                    EditWidgetAttachmentInspectorSkin.layerNotSupportingAttachmentsText = configXML.layernotsupportingattchmentstext || getDefaultString("layerNotSupportingAttachmentsText");
-                    EditWidgetAttachmentInspectorSkin.noAttachmentsText = configXML.noattchmentstext || getDefaultString("noAttachmentsText");
-                    EditWidgetAttachmentInspectorSkin.chooseFileText = configXML.choosefiletext || getDefaultString("chooseFileText");
-                    EditWidgetAttachmentInspectorSkin.attachmentSubmitLabel = configXML.attachmentsubmitlabel || getDefaultString("attachmentSubmitLabel");
-                    EditWidgetAttachmentInspectorSkin.attachmentCancelLabel = configXML.attachmentcancellabel || getDefaultString("attachmentCancelLabel");
-                    EditWidgetAttributeInspectorSkin.deleteLabel = configXML.deletelabel || getDefaultString("deleteLabel");
-                    EditWidgetAttributeInspectorSkin.okLabel = configXML.oklabel || getDefaultString("okLabel");
-                    EditWidgetAttachmentInspectorSkin.showAttributesText = configXML.showattributestext || getDefaultString("showAttributesText");
+                    configureLabels(configXML.labels);
                 }
                 map.addEventListener(MapEvent.LAYER_ADD, mapLayerAddHandler, false);
                 map.addEventListener(MapEvent.LAYER_REMOVE, mapLayerRemoveHandler, false);
@@ -238,6 +206,45 @@
                 populateEditor(arrLayers);
             }
 
+            private function toAttributeInspectorFormFieldsOrder(formFieldsOrder:String):String
+            {
+                switch (formFieldsOrder)
+                {
+                    case "alphabetical":
+                    {
+                        return AttributeInspector.ALPHABETICAL_ORDER;
+                    }
+                    case "fieldinspector":
+                    {
+                        return AttributeInspector.FIELD_INSPECTOR_ORDER;
+                    }
+                    case "fields":
+                    default:
+                    {
+                        return AttributeInspector.FIELDS_ORDER;
+                    }
+                }
+            }
+
+            private function configureLabels(labels:XMLList):void
+            {
+                attributesLabel = labels.attributeslabel[0] || getDefaultString("attributesLabel");
+                attachmentsLabel = labels.attachmentslabel[0] || getDefaultString("attachmentsLabel");
+                noEditableLayersText = labels.noeditablelayerstext[0] || getDefaultString("noEditableLayersText");
+
+                EditWidgetTemplatePickerSkin.featureLayerOutOfScaleText = labels.featurelayeroutofscaletext[0] || getDefaultString("featureLayerOutOfScaleText");
+
+                EditWidgetAttributeInspectorSkin.showAttachmentsText = labels.showattachmentstext[0] || getDefaultString("showAttachmentsText");
+                EditWidgetAttributeInspectorSkin.deleteLabel = labels.deletelabel[0] || getDefaultString("deleteLabel");
+                EditWidgetAttributeInspectorSkin.saveLabel = labels.savelabel[0] || getDefaultString("okLabel");
+
+                EditWidgetAttachmentInspectorSkin.noAttachmentsText = labels.noattchmentstext[0] || getDefaultString("noAttachmentsText");
+                EditWidgetAttachmentInspectorSkin.chooseFileText = labels.choosefiletext[0] || getDefaultString("chooseFileText");
+                EditWidgetAttachmentInspectorSkin.attachmentSubmitLabel = labels.attachmentsubmitlabel[0] || getDefaultString("attachmentSubmitLabel");
+                EditWidgetAttachmentInspectorSkin.attachmentCancelLabel = labels.attachmentcancellabel[0] || getDefaultString("attachmentCancelLabel");
+                EditWidgetAttachmentInspectorSkin.showAttributesText = labels.showattributestext[0] || getDefaultString("showAttributesText");
+            }
+
             private function basewidget_creationCompleteHandler(event:FlexEvent):void
             {
                 // do not show template swatch for RTL
@@ -245,7 +252,6 @@
 
                 editor.attributeInspector.setStyle("skinClass", EditWidgetAttributeInspectorSkin);
                 editor.attributeInspector.addEventListener("attachmentGroupClicked", attachmentGroupClickedHandler);
-                editor.attributeInspector.addEventListener("okButtonClicked", okButtonClickHandler);
                 editor.attributeInspector.addEventListener(AttributeInspectorEvent.SHOW_FEATURE, attributeInspector_showFeatureHandler);
 
                 attachmentInspector.addEventListener("attributeGroupClicked", attributeGroupClickedHandler);
@@ -317,9 +323,8 @@
                     {
                         if ((layer is FeatureLayer && layer.name.indexOf("hiddenLayer_") == -1) && FeatureLayer(layer).isEditable && !FeatureLayer(layer).featureCollection)
                         {
-                            // always turn the layer on by default
+//                            changeOplListObjectVisibility(layer);
 
-                            changeOplListObjectVisibility(layer);
                             layer.removeEventListener(FeatureLayerEvent.SELECTION_COMPLETE, featureLayer_selectionComplete);
                             layer.addEventListener(FeatureLayerEvent.SELECTION_COMPLETE, featureLayer_selectionComplete, false, 1);
                             featureLayers.push(layer);
@@ -356,6 +361,10 @@
                     {
                         noLayers.visible = noLayers.includeInLayout = false;
                         selectTemplateLabel.visible = selectTemplateLabel.includeInLayout = true;
+                        if (!atleastOneFeatureLayerHasCreateCapability(featureLayers))
+                        {
+                            selectTemplateLabel.text = getDefaultString("noCreateCapabilityLayersText");
+                        }
 
                         //store the renderer info for each layer on map
                         storeInfoWindowRenderer();
@@ -385,24 +394,16 @@
                 var gdbVersion:String = ArcGISDynamicMapServiceLayer(layer).gdbVersion;
                 var featureServiceURL:String = serviceURL.replace("MapServer", "FeatureServer");
 
-                // send the resonse to see if it has featurelayers
-                const params:URLVariables = new URLVariables();
-                params.f = 'json';
-                const hs:HTTPService = new HTTPService();
-                hs.url = featureServiceURL;
-                if (IdentityManager.instance.findCredential(serviceURL))
-                {
-                    hs.url += "?token=" + IdentityManager.instance.findCredential(serviceURL).token;
-                }
-                hs.useProxy = false;
-                hs.requestTimeout = 30;
-                const asyncToken:AsyncToken = hs.send(params);
-                asyncToken.addResponder(new AsyncResponder(resultHandler, faultHandler, { layer: layer, count: index }));
+                // get corresponding featurelayers
+                var jsonTask:JSONTask = new JSONTask;
+                var urlVars:URLVariables = new URLVariables();
+                urlVars.f = "json";
+                jsonTask.url = featureServiceURL;
+                jsonTask.execute(urlVars, new AsyncResponder(jsonTask_resultHandler, jsonTask_faultHandler, { layer: layer, count: index }));
 
-                function resultHandler(event:ResultEvent, token:Object = null):void
+                function jsonTask_resultHandler(resultObject:Object, token:Object = null):void
                 {
-                    const decodedObject:Object = JSONUtil.decode(event.result as String);
-                    const layers:Array = decodedObject.layers;
+                    const layers:Array = resultObject.layers;
                     if (layers && layers.length)
                     {
                         var atleastOneFeatureLayerAlreadyIncluded:Boolean;
@@ -538,6 +539,11 @@
                                 parseCandidateFeatureLayers(index1, candidateFeatureLayers);
                             }
                         }
+                        else
+                        {
+                            index = token.count + 1;
+                            getAllFeatureLayers(index, featureLayers);
+                        }
                     }
                     else
                     {
@@ -545,7 +551,7 @@
                         getAllFeatureLayers(index, featureLayers);
                     }
                 }
-                function faultHandler(event:FaultEvent, token:Object = null):void
+                function jsonTask_faultHandler(fault:Fault, token:Object = null):void
                 {
                     if (!onMapLayerAdd)
                     {
@@ -852,12 +858,12 @@
             {
                 var result:Boolean;
 
-                // loop through all the operational layers
+                // loop through all the map layers
                 for (var n:int = 0; n < mapLayers.length; )
                 {
                     if (mapLayers.getItemAt(n) is FeatureLayer &&
-                        FeatureLayer(mapLayers.getItemAt(n)).url == featureLayerURL
-                        && FeatureLayer(mapLayers.getItemAt(n)).gdbVersion && FeatureLayer(mapLayers.getItemAt(n)).gdbVersion == gdbVersion)
+                        FeatureLayer(mapLayers.getItemAt(n)).url == featureLayerURL &&
+                        FeatureLayer(mapLayers.getItemAt(n)).gdbVersion == gdbVersion)
                     {
                         result = true;
                         break;
@@ -1039,6 +1045,36 @@
                 }
             }
 
+            private function atleastOneFeatureLayerHasCreateCapability(featureLayers:Array):Boolean
+            {
+                var result:Boolean;
+                for each (var featureLayer:FeatureLayer in featureLayers)
+                {
+                    if (isCreateAllowed(featureLayer))
+                    {
+                        result = true;
+                        break;
+                    }
+                }
+                return result;
+            }
+
+            private function isCreateAllowed(featureLayer:FeatureLayer):Boolean
+            {
+                var result:Boolean;
+
+                if (featureLayer.layerDetails is FeatureLayerDetails)
+                {
+                    result = (featureLayer.layerDetails as FeatureLayerDetails).isCreateAllowed;
+                }
+                else if (featureLayer.tableDetails is FeatureTableDetails)
+                {
+                    result = (featureLayer.layerDetails as FeatureTableDetails).isCreateAllowed;
+                }
+
+                return result;
+            }
+
             private function deactivateEditor():void
             {
                 map.infoWindow.hide();
@@ -1078,11 +1114,6 @@
                 }
             }
 
-            private function okButtonClickHandler(event:Event):void
-            {
-                map.infoWindow.hide();
-            }
-
             private function attributeGroupClickedHandler(event:Event):void
             {
                 map.infoWindow.content = editor.attributeInspector;
diff --git a/src/widgets/Edit/EditWidget.xml b/src/widgets/Edit/EditWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Edit/EditWidgetAttachmentInfoList.as b/src/widgets/Edit/EditWidgetAttachmentInfoList.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Edit/EditWidgetAttachmentInspectorCancelButtonSkin.mxml b/src/widgets/Edit/EditWidgetAttachmentInspectorCancelButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Edit/EditWidgetAttachmentInspectorSkin.mxml b/src/widgets/Edit/EditWidgetAttachmentInspectorSkin.mxml
old mode 100644
new mode 100755
index a2aca4d..302b42f
--- a/src/widgets/Edit/EditWidgetAttachmentInspectorSkin.mxml
+++ b/src/widgets/Edit/EditWidgetAttachmentInspectorSkin.mxml
@@ -53,8 +53,6 @@
             import spark.components.HScrollBar;
             import spark.events.IndexChangeEvent;
 
-            [Bindable]
-            public static var layerNotSupportingAttachmentsText:String;
             [Bindable]
             public static var noAttachmentsText:String;
             [Bindable]
@@ -183,7 +181,7 @@
     <s:states>
         <s:State name="normal"/>
         <s:State name="disabled"/>
-        <s:State name="queryAttachmentInfos"/>
+        <s:State name="queryAttachmentInfos" stateGroups="queryAttachmentInfosGroup"/>
         <s:State name="queryAttachmentInfosWithList" stateGroups="queryAttachmentInfosGroup"/>
         <s:State name="attachmentLoaded" stateGroups="loadState"/>
         <s:State name="attachmentLoadedNoAttachmentsInList" stateGroups="noAttachmentsState,loadState"/>
@@ -192,10 +190,9 @@
     <s:layout>
         <s:VerticalLayout horizontalAlign="center"/>
     </s:layout>
-
-    <mx:Image includeIn="queryAttachmentInfos"
-              minHeight.queryAttachmentInfosWithList="140"
-              minWidth.queryAttachmentInfosWithList="200"
+    <!--- @private -->
+    <mx:Image horizontalAlign="center"
+              includeIn="queryAttachmentInfosGroup"
               source="assets/images/loader.swf"/>
     <s:Label id="numAttachments"
              excludeFrom="noAttachmentsState, disabled"
@@ -219,6 +216,7 @@
                                            doubleClick="attachmentInfoList_clickHandler(event)"
                                            doubleClickEnabled="true"
                                            enabled.disabled="false"
+                                           excludeFrom="noAttachmentsState,queryAttachmentInfosGroup,disabled"
                                            isEditable="{hostComponent.featureLayer.isEditable}"
                                            itemRenderer="widgets.Edit.EditWidgetAttachmentRenderer"
                                            keyUp="attachmentInfoList_keyUpHandler(event)"
@@ -232,9 +230,6 @@
             </edit:layout>
         </edit:EditWidgetAttachmentInfoList>
     </s:BorderContainer>
-    <s:Label fontWeight="bold"
-             includeIn="disabled"
-             text="{layerNotSupportingAttachmentsText}"/>
     <s:Label fontWeight="bold"
              includeIn="noAttachmentsInList"
              text="{noAttachmentsText}"/>
diff --git a/src/widgets/Edit/EditWidgetAttachmentInspectorSubmitButtonSkin.mxml b/src/widgets/Edit/EditWidgetAttachmentInspectorSubmitButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Edit/EditWidgetAttachmentRenderer.mxml b/src/widgets/Edit/EditWidgetAttachmentRenderer.mxml
old mode 100644
new mode 100755
index ad1f7c1..2885b11
--- a/src/widgets/Edit/EditWidgetAttachmentRenderer.mxml
+++ b/src/widgets/Edit/EditWidgetAttachmentRenderer.mxml
@@ -24,13 +24,7 @@
         <![CDATA[
             import com.esri.ags.components.supportClasses.AttachmentRemoveEvent;
             import com.esri.ags.layers.supportClasses.AttachmentInfo;
-            import com.esri.ags.skins.AttachmentInspectorSkin;
 
-            import mx.controls.Alert;
-            import mx.events.CloseEvent;
-            import mx.events.FlexEvent;
-
-            import spark.components.BorderContainer;
             import spark.components.List;
 
             [Bindable]
@@ -157,7 +151,7 @@
                 }
             }
 
-            protected function button1_clickHandler(event:MouseEvent):void
+            protected function deleteButton_clickHandler(event:MouseEvent):void
             {
                 event.stopImmediatePropagation();
 
@@ -203,8 +197,8 @@
               buttonMode="true"
               emphasized="true"
               includeIn="hovered,selected"
-              includeInLayout="{EditWidgetAttachmentInfoList(owner).deleteEnabled}"
-              mouseDown="button1_clickHandler(event)"
+              includeInLayout="{EditWidgetAttachmentInfoList(owner).deleteEnabled &amp;&amp; EditWidgetAttachmentInfoList(owner).isEditable}"
+              mouseDown="deleteButton_clickHandler(event)"
               skinClass="com.esri.ags.skins.supportClasses.AttachmentRendererDeleteButtonSkin"
-              visible="{EditWidgetAttachmentInfoList(owner).deleteEnabled}"/>
+              visible="{EditWidgetAttachmentInfoList(owner).deleteEnabled &amp;&amp; EditWidgetAttachmentInfoList(owner).isEditable}"/>
 </s:ItemRenderer>
diff --git a/src/widgets/Edit/EditWidgetAttributeInspectorSkin.mxml b/src/widgets/Edit/EditWidgetAttributeInspectorSkin.mxml
old mode 100644
new mode 100755
index 9e4a359..80ffee8
--- a/src/widgets/Edit/EditWidgetAttributeInspectorSkin.mxml
+++ b/src/widgets/Edit/EditWidgetAttributeInspectorSkin.mxml
@@ -25,12 +25,14 @@
         [HostComponent("com.esri.ags.components.AttributeInspector")]
 
         [Event(name="attachmentGroupClicked", type="flash.events.Event")]
-        [Event(name="okButtonClicked", type="flash.events.Event")]
     </fx:Metadata>
 
     <fx:Script>
         <![CDATA[
+            import com.esri.ags.Graphic;
             import com.esri.ags.layers.FeatureLayer;
+            import com.esri.ags.layers.supportClasses.FeatureLayerDetails;
+            import com.esri.ags.layers.supportClasses.FeatureTableDetails;
 
             // configurable through the edit widget's config file
             [Bindable]
@@ -38,16 +40,33 @@
             [Bindable]
             public static var deleteLabel:String;
             [Bindable]
-            public static var okLabel:String;
+            public static var saveLabel:String;
 
             private function attachmentGroup_clickHandler(event:MouseEvent):void
             {
                 dispatchEvent(new Event("attachmentGroupClicked", true, true));
             }
 
-            protected function okButton_clickHandler(event:MouseEvent):void
+            private function isAttachmentGroupShown(activeFeature:Graphic):Boolean
             {
-                dispatchEvent(new Event("okButtonClicked", true, true));
+                var result:Boolean;
+
+                if (activeFeature.graphicsLayer is FeatureLayer)
+                {
+                    const featureLayer:FeatureLayer = FeatureLayer(activeFeature.graphicsLayer);
+                    if (featureLayer.layerDetails is FeatureLayerDetails)
+                    {
+                        const featureLayerDetails:FeatureLayerDetails = FeatureLayerDetails(featureLayer.layerDetails);
+                        result = featureLayerDetails.hasAttachments;
+                    }
+                    else if (featureLayer.tableDetails is FeatureTableDetails)
+                    {
+                        const featureTableDetails:FeatureTableDetails = FeatureTableDetails(featureLayer.tableDetails);
+                        result = featureTableDetails.hasAttachments;
+                    }
+                }
+
+                return result;
             }
         ]]>
     </fx:Script>
@@ -62,6 +81,25 @@
         <s:VerticalLayout horizontalAlign="center"/>
     </s:layout>
 
+    <s:HGroup gap="8"
+              includeInLayout="{hostComponent.numFeatures&gt;1}"
+              verticalAlign="middle"
+              visible="{hostComponent.numFeatures&gt;1}">
+        <!--- Button to go to the previous feature in the selection set. -->
+        <s:Button id="previousButton"
+                  enabled.disabled="false"
+                  skinClass="com.esri.ags.skins.AttributeInspectorPreviousButtonSkin"/>
+        <!--- Form to display the attributes of the active feature. -->
+        <s:Label width="100%"
+                 fontSize="14"
+                 fontWeight="bold"
+                 text="{hostComponent.activeFeatureIndex+1} {resourceManager.getString('ESRIMessages','attributeInspectorOf')} {hostComponent.numFeatures}"
+                 textAlign="center"/>
+        <!--- Button to go to the next feature in the selection set. -->
+        <s:Button id="nextButton"
+                  enabled.disabled="false"
+                  skinClass="com.esri.ags.skins.AttributeInspectorNextButtonSkin"/>
+    </s:HGroup>
     <!--- List to display the attributes of the active feature. -->
     <s:List id="list"
             width="100%" height="100%"
@@ -80,24 +118,29 @@
                           paddingTop="10"/>
         </s:layout>
     </s:List>
-
+    <!--- Label to show the edit summary. -->
+    <s:Label id="editSummaryLabel"
+             width="100%"
+             enabled.disabled="false"
+             fontStyle="italic"/>
     <s:HGroup verticalAlign="middle">
         <!--- Button to delete the active feature. -->
         <s:Button id="deleteButton"
+                  buttonMode="true"
                   enabled.disabled="false"
-                  label="{deleteLabel}"/>
-
+                  label="{deleteLabel}"
+                  skinClass="com.esri.ags.skins.AttributeInspectorDeleteButtonSkin"/>
+        <!--- Button to indicate completion of editing/viewing attributes -->
         <s:Button id="okButton"
-                  click="okButton_clickHandler(event)"
                   enabled.disabled="false"
-                  label="{okLabel}"/>
+                  label="{saveLabel}"/>
     </s:HGroup>
     <s:HGroup id="attachmentGroup"
               width="100%"
               horizontalAlign="right"
-              includeInLayout="{FeatureLayer(hostComponent.activeFeature.graphicsLayer).layerDetails.hasAttachments}"
+              includeInLayout="{isAttachmentGroupShown(hostComponent.activeFeature)}"
               verticalAlign="middle"
-              visible="{FeatureLayer(hostComponent.activeFeature.graphicsLayer).layerDetails.hasAttachments}">
+              visible="{isAttachmentGroupShown(hostComponent.activeFeature)}">
         <s:Label buttonMode="true"
                  click="attachmentGroup_clickHandler(event)"
                  fontWeight="bold"
diff --git a/src/widgets/Edit/EditWidgetTemplatePickerListItemRenderer.mxml b/src/widgets/Edit/EditWidgetTemplatePickerListItemRenderer.mxml
old mode 100644
new mode 100755
index d6a5000..9c4a1bc
--- a/src/widgets/Edit/EditWidgetTemplatePickerListItemRenderer.mxml
+++ b/src/widgets/Edit/EditWidgetTemplatePickerListItemRenderer.mxml
@@ -53,15 +53,17 @@
                 // set style on the label
                 templateLabel.setStyle("textAlign", TextAlign.CENTER);
 
+                var drawingToolShape:String;
                 if (value.featureTemplate)
                 {
                     templateLabel.text = value.featureTemplate.name;
                     toolTip = (value.featureTemplate.description != "") ? value.featureTemplate.name + ": " + value.featureTemplate.description : value.featureTemplate.name;
+                    drawingToolShape = value.featureTemplate.drawingTool; // show the swatch which matches the drawing tool shape
                 }
                 var symbol:Symbol = value.symbol;
                 if (symbol)
                 {
-                    contentGroup.addElement(IVisualElement(symbol.createSwatch(contentGroup.width, contentGroup.height)));
+                    contentGroup.addElement(IVisualElement(symbol.createSwatch(contentGroup.width, contentGroup.height, drawingToolShape)));
                 }
                 else
                 {
diff --git a/src/widgets/Edit/EditWidgetTemplatePickerSkin.mxml b/src/widgets/Edit/EditWidgetTemplatePickerSkin.mxml
old mode 100644
new mode 100755
index 8e45d65..589c4ae
--- a/src/widgets/Edit/EditWidgetTemplatePickerSkin.mxml
+++ b/src/widgets/Edit/EditWidgetTemplatePickerSkin.mxml
@@ -67,7 +67,7 @@ Custom skin class for the TemplatePicker component.
             private var _itemRenderer:EditWidgetTemplatePickerListItemRenderer = new EditWidgetTemplatePickerListItemRenderer;
 
             // configurable through the edit widget's config file
-            public static var featureLayerNotVisibleText:String;
+            public static var featureLayerOutOfScaleText:String;
 
             private function sparkskin1_initializeHandler(event:FlexEvent):void
             {
@@ -142,7 +142,7 @@ Custom skin class for the TemplatePicker component.
                         checkbox.name = featureLayer.name;
                         checkbox.label = featureLayerDisplayName;
                         checkbox.setStyle("fontWeight", "bold");
-                        checkbox.selected = featureLayer.visible && featureLayer.isInScaleRange;
+                        checkbox.selected = featureLayer.visible;
                         vGrp.addElement(checkbox);
 
                         var templateList:List = new List;
@@ -163,9 +163,9 @@ Custom skin class for the TemplatePicker component.
                         var text:Text = new Text;
                         text.percentWidth = 100;
                         text.name = featureLayer.name;
-                        text.text = featureLayerDisplayName + " " + featureLayerNotVisibleText;
+                        text.text = featureLayerOutOfScaleText;
                         text.setStyle("fontStyle", FontPosture.ITALIC);
-                        text.visible = text.includeInLayout = !featureLayer.visible || !featureLayer.isInScaleRange;
+                        text.visible = text.includeInLayout = !featureLayer.isInScaleRange;
                         vGrp.addElement(text);
                     }
                     invalidateDisplayList();
@@ -289,13 +289,13 @@ Custom skin class for the TemplatePicker component.
                     if (vGrp.getElementAt(i) is CheckBox && CheckBox(vGrp.getElementAt(i)).name == layerName)
                     {
                         const checkBox:CheckBox = CheckBox(vGrp.getElementAt(i));
-                        checkBox.selected = featureLayer.isInScaleRange && featureLayer.visible;
+                        checkBox.selected = featureLayer.visible;
                     }
                     if (vGrp.getElementAt(i) is Label && Label(vGrp.getElementAt(i)).name == layerName)
                     {
                         const label:Label = Label(vGrp.getElementAt(i));
-                        label.visible = !featureLayer.isInScaleRange || !featureLayer.visible;
-                        label.includeInLayout = !featureLayer.isInScaleRange || !featureLayer.visible;
+                        label.visible = !featureLayer.isInScaleRange;
+                        label.includeInLayout = !featureLayer.isInScaleRange;
                     }
                 }
                 invalidateDisplayList();
@@ -367,6 +367,13 @@ Custom skin class for the TemplatePicker component.
         ]]>
     </fx:Script>
 
+    <mx:Image width="30" height="30"
+              autoLoad="true"
+              horizontalCenter="0"
+              includeIn="loading"
+              scaleContent="true"
+              source="assets/images/loader.swf"
+              verticalCenter="0"/>
     <!--- @private -->
     <s:VGroup id="vGrp"
               width="100%" height="100%"/>
diff --git a/src/widgets/GeoRSS/GeoRSSFeedDataGroup.as b/src/widgets/GeoRSS/GeoRSSFeedDataGroup.as
old mode 100644
new mode 100755
diff --git a/src/widgets/GeoRSS/GeoRSSFeedItemRenderer.mxml b/src/widgets/GeoRSS/GeoRSSFeedItemRenderer.mxml
old mode 100644
new mode 100755
index 063a132..a536acc
--- a/src/widgets/GeoRSS/GeoRSSFeedItemRenderer.mxml
+++ b/src/widgets/GeoRSS/GeoRSSFeedItemRenderer.mxml
@@ -35,21 +35,23 @@
 
             import spark.components.Application;
 
-            private const GEO_RSS_FEED_CLICK:String = "geoRSSFeedClick";
+            import widgets.supportClasses.ResultAttributes;
+            import widgets.supportClasses.ResultItem;
 
+            private const GEO_RSS_FEED_CLICK:String = "geoRSSFeedClick";
             private const GEO_RSS_FEED_MOUSE_OVER:String = "geoRSSFeedMouseOver";
-
             private const GEO_RSS_FEED_MOUSE_OUT:String = "geoRSSFeedMouseOut";
 
             [Bindable]
-            private var geoRSSFeed:GeoRSSFeed;
+            private var geoRSSFeedAttributes:ResultAttributes;
 
             private var lastResultSymbol:Symbol;
             private var lastResultSwatch:UIComponent;
 
             private function itemrenderer_dataChangeHandler(event:FlexEvent):void
             {
-                geoRSSFeed = data as GeoRSSFeed;
+                var geoRSSFeed:ResultItem = data as ResultItem;
+                geoRSSFeedAttributes = geoRSSFeed.attributes
 
                 if (geoRSSFeed && geoRSSFeed.symbol)
                 {
@@ -92,7 +94,7 @@
             private function showLink(event:MouseEvent):void
             {
                 event.stopImmediatePropagation(); // don't dispatch GEO_RSS_FEED_CLICK since we don't want to zoom to feature
-                navigateToURL(new URLRequest(geoRSSFeed.link));
+                navigateToURL(new URLRequest(geoRSSFeedAttributes.link));
             }
 
             protected function feedLink_preinitializeHandler(event:FlexEvent):void
@@ -165,11 +167,11 @@
             <s:Label width="100%"
                      fontWeight="bold"
                      maxDisplayedLines="-1"
-                     text="{geoRSSFeed.title}"/>
+                     text="{geoRSSFeedAttributes.title}"/>
             <s:Label width="100%"
                      fontWeight="normal"
                      maxDisplayedLines="-1"
-                     text="{geoRSSFeed.content}"/>
+                     text="{geoRSSFeedAttributes.content}"/>
         </s:VGroup>
         <mx:Image id="feedLink"
                   width="18" height="18"
@@ -177,7 +179,7 @@
                   click="showLink(event)"
                   preinitialize="feedLink_preinitializeHandler(event)"
                   source="assets/images/w_link.png"
-                  toolTip="{geoRSSFeed.link}"
+                  toolTip="{geoRSSFeedAttributes.link}"
                   useHandCursor="true"/>
     </s:HGroup>
 </s:ItemRenderer>
diff --git a/src/widgets/GeoRSS/GeoRSSWidget.mxml b/src/widgets/GeoRSS/GeoRSSWidget.mxml
old mode 100644
new mode 100755
index ab10610..3988960
--- a/src/widgets/GeoRSS/GeoRSSWidget.mxml
+++ b/src/widgets/GeoRSS/GeoRSSWidget.mxml
@@ -30,8 +30,6 @@
             import com.esri.ags.Map;
             import com.esri.ags.geometry.Geometry;
             import com.esri.ags.geometry.MapPoint;
-            import com.esri.ags.geometry.Polygon;
-            import com.esri.ags.geometry.Polyline;
             import com.esri.ags.layers.GraphicsLayer;
             import com.esri.ags.symbols.PictureMarkerSymbol;
             import com.esri.ags.symbols.SimpleFillSymbol;
@@ -39,22 +37,21 @@
             import com.esri.ags.symbols.Symbol;
             import com.esri.ags.utils.StringUtil;
             import com.esri.ags.utils.WebMercatorUtil;
-            import com.esri.ags.webmap.PopUpRenderer;
-            import com.esri.ags.webmap.supportClasses.PopUpInfo;
-            import com.esri.ags.webmap.supportClasses.PopUpMediaInfo;
-            import com.esri.viewer.AppEvent;
-            import com.esri.viewer.ViewerContainer;
+            import com.esri.ags.portal.PopUpRenderer;
+            import com.esri.ags.portal.supportClasses.PopUpInfo;
+            import com.esri.ags.portal.supportClasses.PopUpMediaInfo;
             import com.esri.viewer.utils.GeoRSSUtil;
             import com.esri.viewer.utils.Namespaces;
 
             import mx.collections.ArrayCollection;
-            import mx.controls.Alert;
-            import mx.core.UIComponent;
             import mx.events.FlexEvent;
             import mx.rpc.events.ResultEvent;
 
             import spark.components.supportClasses.ItemRenderer;
 
+            import widgets.supportClasses.ResultAttributes;
+            import widgets.supportClasses.ResultItem;
+
             private static const ATOM:Namespace = Namespaces.ATOM_NS;
 
             private static const RE:RegExp = /M[ ](?P<mag>[^,]+),\.*/;
@@ -300,13 +297,12 @@
                     var graphic:Graphic = new Graphic(geometry);
                     graphic.checkForMouseListeners = false;
 
-                    var geoRSSFeed:GeoRSSFeed = new GeoRSSFeed;
-                    geoRSSFeed.title = title;
-                    geoRSSFeed.content = content;
-                    geoRSSFeed.point = getGeomCenter(graphic);
-                    geoRSSFeed.link = link;
-                    geoRSSFeed.geometry = geometry;
-                    geoRSSFeed.graphic = graphic;
+                    var resultAttributes:ResultAttributes = new ResultAttributes();
+                    resultAttributes.title = title;
+                    resultAttributes.content = content;
+                    resultAttributes.link = link ? link : null;
+
+                    var geoRSSFeed:ResultItem = new ResultItem(graphic, resultAttributes);
 
                     if (geometry)
                     {
@@ -314,25 +310,25 @@
                         {
                             case Geometry.POLYLINE:
                             {
-                                graphic.symbol = geoRSSFeed.symbol = resultLineSymbol;
+                                graphic.symbol = resultLineSymbol;
                                 break;
                             }
                             case Geometry.POLYGON:
                             {
-                                graphic.symbol = geoRSSFeed.symbol = resultFillSymbol;
+                                graphic.symbol = resultFillSymbol;
                                 break;
                             }
                             case Geometry.MAPPOINT:
                             {
-                                graphic.symbol = geoRSSFeed.symbol = resultMarkerSymbol;
+                                graphic.symbol = resultMarkerSymbol;
                                 break;
                             }
                         }
                     }
-                    graphic.attributes = geoRSSFeed;
+                    graphic.attributes = resultAttributes;
                     result.addItem(geoRSSFeed);
 
-                    if (geoRSSFeed.point && !isNaN(geoRSSFeed.point.x) && !isNaN(geoRSSFeed.point.y)) // make sure it is a valid point
+                    if (geoRSSFeed.center && !isNaN(geoRSSFeed.center.x) && !isNaN(geoRSSFeed.center.y)) // make sure it is a valid point
                     {
                         graphicsLayer.add(graphic);
                     }
@@ -398,48 +394,11 @@
                 return "";
             }
 
-            private function getGeomCenter(graphic:Graphic):MapPoint
-            {
-                var point:MapPoint;
-                var geometry:Geometry = graphic.geometry;
-
-                if (geometry)
-                {
-                    switch (geometry.type)
-                    {
-                        case Geometry.MAPPOINT:
-                        {
-                            point = geometry as MapPoint;
-                            break;
-                        }
-                        case Geometry.POLYLINE:
-                        {
-                            var pl:Polyline = geometry as Polyline;
-                            var pathCount:Number = pl.paths.length;
-                            var pathIndex:int = int((pathCount / 2) - 1);
-                            var midPath:Array = pl.paths[pathIndex];
-                            var ptCount:Number = midPath.length;
-                            var ptIndex:int = int((ptCount / 2) - 1);
-                            point = pl.getPoint(pathIndex, ptIndex);
-                            break;
-                        }
-                        case Geometry.POLYGON:
-                        {
-                            const poly:Polygon = geometry as Polygon;
-                            point = poly.extent.center;
-                            break;
-                        }
-                    }
-                }
-
-                return point;
-            }
-
             private function mouseOverGeoRSSFeed(event:Event):void
             {
                 clearTimeout(highlightTimer);
-                var geoRSSFeed:GeoRSSFeed = ItemRenderer(event.target).data as GeoRSSFeed;
-                if (map.extent.containsXY(geoRSSFeed.point.x, geoRSSFeed.point.y)) // only show infowindow if feed in contained within map extent
+                var geoRSSFeed:ResultItem = ItemRenderer(event.target).data as ResultItem;
+                if (map.extent.containsXY(geoRSSFeed.center.x, geoRSSFeed.center.y)) // only show infowindow if feed in contained within map extent
                 {
                     highlightTimer = setTimeout(showHighlight, 300, [ geoRSSFeed ]);
                 }
@@ -456,14 +415,14 @@
 
             private function clickGeoRSSFeed(event:Event):void
             {
-                var geoRSSFeed:GeoRSSFeed = ItemRenderer(event.target).data as GeoRSSFeed;
-                if (geoRSSFeed.point)
+                var geoRSSFeed:ResultItem = ItemRenderer(event.target).data as ResultItem;
+                if (geoRSSFeed.center)
                 {
                     if (map.scale > zoomScale)
                     {
                         map.scale = zoomScale;
                     }
-                    map.centerAt(geoRSSFeed.point);
+                    map.centerAt(geoRSSFeed.center);
                 }
                 clearTimeout(highlightTimer);
                 highlightTimer = setTimeout(showHighlight, 300, [ geoRSSFeed ]);
@@ -471,10 +430,11 @@
 
             private function showHighlight(params:Array):void
             {
-                var showHighlightPoint:MapPoint = params[0].point as MapPoint;
+                var geoRSSFeed:ResultItem = params[0];
+                var showHighlightPoint:MapPoint = geoRSSFeed.center as MapPoint;
 
-                popUpRenderer.popUpInfo = configurePopUpInfo(params[0].graphic.attributes.link);
-                popUpRenderer.graphic = params[0].graphic;
+                popUpRenderer.popUpInfo = configurePopUpInfo(geoRSSFeed.attributes.link);
+                popUpRenderer.graphic = geoRSSFeed.graphic;
 
                 map.infoWindow.content = popUpRenderer;
                 map.infoWindow.contentOwner = popUpRenderer.graphic;
@@ -521,7 +481,6 @@
     </fx:Script>
 
     <fx:Declarations>
-        <!-- HTTP SERVICE -->
         <mx:HTTPService id="rssService"
                         fault="faultHandler(event)"
                         result="loadRSSData(event)"
diff --git a/src/widgets/GeoRSS/GeoRSSWidget.xml b/src/widgets/GeoRSS/GeoRSSWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/GeoprocessingWidget.mxml b/src/widgets/Geoprocessing/GeoprocessingWidget.mxml
old mode 100644
new mode 100755
index afdf8dc..164fa79
--- a/src/widgets/Geoprocessing/GeoprocessingWidget.mxml
+++ b/src/widgets/Geoprocessing/GeoprocessingWidget.mxml
@@ -42,12 +42,12 @@
             import com.esri.ags.symbols.SimpleLineSymbol;
             import com.esri.ags.symbols.SimpleMarkerSymbol;
             import com.esri.ags.tasks.GeometryServiceSingleton;
+            import com.esri.ags.tasks.JSONTask;
             import com.esri.ags.tasks.supportClasses.DataFile;
             import com.esri.ags.tasks.supportClasses.JobInfo;
             import com.esri.ags.tasks.supportClasses.ParameterValue;
             import com.esri.ags.tasks.supportClasses.ProjectParameters;
             import com.esri.viewer.AppEvent;
-            import com.esri.viewer.utils.GenericJSONTask;
 
             import flashx.textLayout.conversion.TextConverter;
 
@@ -174,7 +174,7 @@
 
             private function getExecutionType():void
             {
-                var gpTaskInspector:GenericJSONTask = new GenericJSONTask();
+                var gpTaskInspector:JSONTask = new JSONTask();
                 var urlVars:URLVariables = new URLVariables();
                 urlVars.f = "json";
                 gpTaskInspector.url = gp.url;
@@ -194,7 +194,7 @@
 
             private function fetchGPServerDescription():void
             {
-                var gpServerInspector:GenericJSONTask = new GenericJSONTask();
+                var gpServerInspector:JSONTask = new JSONTask();
                 var urlVars:URLVariables = new URLVariables();
                 urlVars.f = "json";
                 gpServerInspector.url = getGPServerURL(gp.url);
@@ -302,7 +302,6 @@
                 if (!currentGraphicsLayer.map)
                 {
                     map.addLayer(currentGraphicsLayer);
-                    layerOrderer.orderLayers();
                 }
 
                 inputParamsDataGroup.dispatchEvent(event);
@@ -932,7 +931,10 @@
             {
                 for each (var resultImageLayer:GPResultImageLayer in resultImageLayersOnMap)
                 {
-                    map.addLayer(resultImageLayer);
+                    if (!map.getLayer(resultImageLayer.id))
+                    {
+                        map.addLayer(resultImageLayer);
+                    }
                 }
             }
         ]]>
diff --git a/src/widgets/Geoprocessing/GeoprocessingWidget_CalculateViewshed.xml b/src/widgets/Geoprocessing/GeoprocessingWidget_CalculateViewshed.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/GeoprocessingWidget_DriveTimes.xml b/src/widgets/Geoprocessing/GeoprocessingWidget_DriveTimes.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/GeoprocessingWidget_ExtractData.xml b/src/widgets/Geoprocessing/GeoprocessingWidget_ExtractData.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/GeoprocessingWidget_MessageInABottle.xml b/src/widgets/Geoprocessing/GeoprocessingWidget_MessageInABottle.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/GeoprocessingWidget_PopulationSummary.xml b/src/widgets/Geoprocessing/GeoprocessingWidget_PopulationSummary.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/GeoprocessingWidget_SurfaceProfile.xml b/src/widgets/Geoprocessing/GeoprocessingWidget_SurfaceProfile.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/BaseParamParser.as b/src/widgets/Geoprocessing/parameters/BaseParamParser.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/BaseParameter.as b/src/widgets/Geoprocessing/parameters/BaseParameter.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/BooleanParameter.as b/src/widgets/Geoprocessing/parameters/BooleanParameter.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/DataFileParameter.as b/src/widgets/Geoprocessing/parameters/DataFileParameter.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/DateParameter.as b/src/widgets/Geoprocessing/parameters/DateParameter.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/DoubleParameter.as b/src/widgets/Geoprocessing/parameters/DoubleParameter.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/FeatureLayerParameter.as b/src/widgets/Geoprocessing/parameters/FeatureLayerParameter.as
old mode 100644
new mode 100755
index a1614c1..a925f25
--- a/src/widgets/Geoprocessing/parameters/FeatureLayerParameter.as
+++ b/src/widgets/Geoprocessing/parameters/FeatureLayerParameter.as
@@ -24,8 +24,8 @@ import com.esri.ags.renderers.IRenderer;
 import com.esri.ags.renderers.SimpleRenderer;
 import com.esri.ags.renderers.UniqueValueRenderer;
 import com.esri.ags.symbols.Symbol;
-import com.esri.ags.webmap.PopUpRenderer;
-import com.esri.ags.webmap.supportClasses.PopUpInfo;
+import com.esri.ags.portal.PopUpRenderer;
+import com.esri.ags.portal.supportClasses.PopUpInfo;
 
 import mx.collections.ArrayCollection;
 import mx.core.ClassFactory;
diff --git a/src/widgets/Geoprocessing/parameters/GPParameterFactory.as b/src/widgets/Geoprocessing/parameters/GPParameterFactory.as
old mode 100644
new mode 100755
index ce8d04b..9c87708
--- a/src/widgets/Geoprocessing/parameters/GPParameterFactory.as
+++ b/src/widgets/Geoprocessing/parameters/GPParameterFactory.as
@@ -59,9 +59,9 @@ public class GPParameterFactory
                 gpParam = new LongParameter();
                 break;
             }
-            case GPParameterTypes.MULTI_VALUE:
+            case GPParameterTypes.MULTI_VALUE_STRING:
             {
-                gpParam = new MultiValueParameter();
+                gpParam = new MultiValueStringParameter();
                 break;
             }
             case GPParameterTypes.RASTER_DATA_LAYER:
diff --git a/src/widgets/Geoprocessing/parameters/GPParameterTypes.as b/src/widgets/Geoprocessing/parameters/GPParameterTypes.as
old mode 100644
new mode 100755
index 6f407cf..5c2db64
--- a/src/widgets/Geoprocessing/parameters/GPParameterTypes.as
+++ b/src/widgets/Geoprocessing/parameters/GPParameterTypes.as
@@ -28,7 +28,7 @@ public class GPParameterTypes
     public static const RECORD_SET:String = "recordset";
     public static const FEATURE_RECORD_SET_LAYER:String = "featurerecordset";
     public static const RASTER_DATA_LAYER:String = "rasterdatalayer";
-    public static const MULTI_VALUE:String = "multivalue";
+    public static const MULTI_VALUE_STRING:String = "multivalue:string";
 
     public static const GP_BOOLEAN:String = "GPBoolean";
     public static const GP_STRING:String = "GPString";
@@ -40,7 +40,7 @@ public class GPParameterTypes
     public static const GP_RECORD_SET:String = "GPRecordSet";
     public static const GP_FEATURE_RECORD_SET_LAYER:String = "GPFeatureRecordSetLayer";
     public static const GP_RASTER_DATA_LAYER:String = "GPRasterDataLayer";
-    public static const GP_MULTI_VALUE:String = "GPMultiValue:GPString"; //only string multivalue supported
+    public static const GP_MULTI_VALUE_STRING:String = "GPMultiValue:GPString"; //only string multivalue supported
 }
 
 }
diff --git a/src/widgets/Geoprocessing/parameters/IGPFeatureParameter.as b/src/widgets/Geoprocessing/parameters/IGPFeatureParameter.as
old mode 100644
new mode 100755
index 6908458..331bc97
--- a/src/widgets/Geoprocessing/parameters/IGPFeatureParameter.as
+++ b/src/widgets/Geoprocessing/parameters/IGPFeatureParameter.as
@@ -20,7 +20,7 @@ import com.esri.ags.SpatialReference;
 import com.esri.ags.layers.GraphicsLayer;
 import com.esri.ags.renderers.IRenderer;
 import com.esri.ags.symbols.Symbol;
-import com.esri.ags.webmap.supportClasses.PopUpInfo;
+import com.esri.ags.portal.supportClasses.PopUpInfo;
 
 import mx.core.ClassFactory;
 
diff --git a/src/widgets/Geoprocessing/parameters/IGPParameter.as b/src/widgets/Geoprocessing/parameters/IGPParameter.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/InputParamParser.as b/src/widgets/Geoprocessing/parameters/InputParamParser.as
old mode 100644
new mode 100755
index e8f3f24..96ef4ad
--- a/src/widgets/Geoprocessing/parameters/InputParamParser.as
+++ b/src/widgets/Geoprocessing/parameters/InputParamParser.as
@@ -40,7 +40,7 @@ public class InputParamParser extends BaseParamParser
 
             if (paramXML.choicelist[0])
             {
-                if (param.type == GPParameterTypes.MULTI_VALUE)
+                if (param.type == GPParameterTypes.MULTI_VALUE_STRING)
                 {
                     param.choiceList = parseMultiValueChoiceList(paramXML.choicelist.choice);
                 }
diff --git a/src/widgets/Geoprocessing/parameters/LinearUnitParameter.as b/src/widgets/Geoprocessing/parameters/LinearUnitParameter.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/LongParameter.as b/src/widgets/Geoprocessing/parameters/LongParameter.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/MultiValueItem.as b/src/widgets/Geoprocessing/parameters/MultiValueItem.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/MultiValueParameter.as b/src/widgets/Geoprocessing/parameters/MultiValueStringParameter.as
old mode 100644
new mode 100755
similarity index 92%
rename from src/widgets/Geoprocessing/parameters/MultiValueParameter.as
rename to src/widgets/Geoprocessing/parameters/MultiValueStringParameter.as
index 4e4b58d..78e1c03
--- a/src/widgets/Geoprocessing/parameters/MultiValueParameter.as
+++ b/src/widgets/Geoprocessing/parameters/MultiValueStringParameter.as
@@ -16,7 +16,7 @@
 package widgets.Geoprocessing.parameters
 {
 
-public class MultiValueParameter extends BaseParameter
+public class MultiValueStringParameter extends BaseParameter
 {
     //--------------------------------------------------------------------------
     //
@@ -46,7 +46,7 @@ public class MultiValueParameter extends BaseParameter
 
     override public function get type():String
     {
-        return GPParameterTypes.MULTI_VALUE;
+        return GPParameterTypes.MULTI_VALUE_STRING;
     }
 
     //--------------------------------------------------------------------------
diff --git a/src/widgets/Geoprocessing/parameters/OutputParamParser.as b/src/widgets/Geoprocessing/parameters/OutputParamParser.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/RasterDataLayerParam.as b/src/widgets/Geoprocessing/parameters/RasterDataLayerParam.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/RecordSetParameter.as b/src/widgets/Geoprocessing/parameters/RecordSetParameter.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/parameters/StringParameter.as b/src/widgets/Geoprocessing/parameters/StringParameter.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/input/GPInputBooleanParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/input/GPInputBooleanParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/input/GPInputDataFileParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/input/GPInputDataFileParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/input/GPInputDateParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/input/GPInputDateParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/input/GPInputDoubleParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/input/GPInputDoubleParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/input/GPInputFeatureParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/input/GPInputFeatureParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/input/GPInputLinearUnitParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/input/GPInputLinearUnitParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/input/GPInputLongParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/input/GPInputLongParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/input/GPInputRasterDataLayerParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/input/GPInputRasterDataLayerParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/input/GPInputRecordSetParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/input/GPInputRecordSetParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/input/GPInputStringParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/input/GPInputStringParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/input/multivalue/GPInputMultiValueParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/input/multivalue/GPInputMultiValueStringParamItemRenderer.mxml
old mode 100644
new mode 100755
similarity index 100%
rename from src/widgets/Geoprocessing/renderers/input/multivalue/GPInputMultiValueParamItemRenderer.mxml
rename to src/widgets/Geoprocessing/renderers/input/multivalue/GPInputMultiValueStringParamItemRenderer.mxml
diff --git a/src/widgets/Geoprocessing/renderers/input/multivalue/MultiValueItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/input/multivalue/MultiValueItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/output/GPOutputLinearUnitParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/output/GPOutputLinearUnitParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/output/GPOutputParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/output/GPOutputParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/output/GPOutputRasterDataParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/output/GPOutputRasterDataParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/renderers/output/GPOutputRecordSetParamItemRenderer.mxml b/src/widgets/Geoprocessing/renderers/output/GPOutputRecordSetParamItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/supportClasses/FeatureInputParamEvent.as b/src/widgets/Geoprocessing/supportClasses/FeatureInputParamEvent.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/supportClasses/FileDownloader.as b/src/widgets/Geoprocessing/supportClasses/FileDownloader.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/supportClasses/GPParamHandler.as b/src/widgets/Geoprocessing/supportClasses/GPParamHandler.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/supportClasses/GraphicEditor.as b/src/widgets/Geoprocessing/supportClasses/GraphicEditor.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/supportClasses/InputParamDataGroup.mxml b/src/widgets/Geoprocessing/supportClasses/InputParamDataGroup.mxml
old mode 100644
new mode 100755
index c6c82d8..aed5104
--- a/src/widgets/Geoprocessing/supportClasses/InputParamDataGroup.mxml
+++ b/src/widgets/Geoprocessing/supportClasses/InputParamDataGroup.mxml
@@ -37,8 +37,7 @@
             import widgets.Geoprocessing.renderers.input.GPInputRasterDataLayerParamItemRenderer;
             import widgets.Geoprocessing.renderers.input.GPInputRecordSetParamItemRenderer;
             import widgets.Geoprocessing.renderers.input.GPInputStringParamItemRenderer;
-            import widgets.Geoprocessing.renderers.input.multivalue.GPInputMultiValueParamItemRenderer;
-            import widgets.Geoprocessing.supportClasses.FeatureInputParamEvent;
+            import widgets.Geoprocessing.renderers.input.multivalue.GPInputMultiValueStringParamItemRenderer;
 
             private var _visibleGraphicsLayers:ArrayList;
 
@@ -103,9 +102,9 @@
                         itemRendererClass = GPInputRasterDataLayerParamItemRenderer;
                         break;
                     }
-                    case GPParameterTypes.MULTI_VALUE:
+                    case GPParameterTypes.MULTI_VALUE_STRING:
                     {
-                        itemRendererClass = GPInputMultiValueParamItemRenderer;
+                        itemRendererClass = GPInputMultiValueStringParamItemRenderer;
                         break;
                     }
                     default:
diff --git a/src/widgets/Geoprocessing/supportClasses/LayerOrderer.as b/src/widgets/Geoprocessing/supportClasses/LayerOrderer.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/supportClasses/OutputParamDataGroup.mxml b/src/widgets/Geoprocessing/supportClasses/OutputParamDataGroup.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/supportClasses/UnitMappingUtil.as b/src/widgets/Geoprocessing/supportClasses/UnitMappingUtil.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Geoprocessing/supportClasses/VisibleGraphicsLayersWatcher.as b/src/widgets/Geoprocessing/supportClasses/VisibleGraphicsLayersWatcher.as
old mode 100644
new mode 100755
diff --git a/src/widgets/HeaderController/GroupWidgetItemDataGroupRenderer.mxml b/src/widgets/HeaderController/GroupWidgetItemDataGroupRenderer.mxml
old mode 100644
new mode 100755
index 13480e5..cb4fe0c
--- a/src/widgets/HeaderController/GroupWidgetItemDataGroupRenderer.mxml
+++ b/src/widgets/HeaderController/GroupWidgetItemDataGroupRenderer.mxml
@@ -71,11 +71,11 @@
               rollOut="mouseOutHandler(event)"
               rollOver="mouseOverHandler(event)"
               verticalAlign="middle">
-        <mx:Image id="icon"
-                  width="25" height="100%"
-                  buttonMode="true"
-                  smoothBitmapContent="true"
-                  useHandCursor="true"/>
+        <s:Image id="icon"
+                 width="25" height="100%"
+                 buttonMode="true"
+                 smooth="true"
+                 useHandCursor="true"/>
         <s:Graphic>
             <s:Group>
                 <s:Path data="m 3 0 l -6 0 l 3 7 z">
diff --git a/src/widgets/HeaderController/HeaderControllerWidget.mxml b/src/widgets/HeaderController/HeaderControllerWidget.mxml
old mode 100644
new mode 100755
index 6923b10..739d844
--- a/src/widgets/HeaderController/HeaderControllerWidget.mxml
+++ b/src/widgets/HeaderController/HeaderControllerWidget.mxml
@@ -119,9 +119,9 @@
                 if (configXML)
                 {
                     aboutContent = configXML.about.content || "";
-                    labelText = configXML.about.label || getDefaultString("aboutLabel");
+                    labelText = configXML.labels.abouttext[0] || configXML.about.label[0] || getDefaultString("aboutLabel");
                     labelVisible = configXML.about.visible.toString() || "true";
-                    aboutButtonLabel = configXML.about.btnlabel || getDefaultString("okLabel");
+                    aboutButtonLabel = configXML.labels.btnlabel[0] || configXML.about.btnlabel[0] || getDefaultString("okLabel");
                     aboutWidth = configXML.about.width || 500;
                     aboutHeight = configXML.about.height || 500;
                 }
diff --git a/src/widgets/HeaderController/HeaderControllerWidget.xml b/src/widgets/HeaderController/HeaderControllerWidget.xml
old mode 100644
new mode 100755
index f17239c..0779313
--- a/src/widgets/HeaderController/HeaderControllerWidget.xml
+++ b/src/widgets/HeaderController/HeaderControllerWidget.xml
@@ -9,7 +9,7 @@
                     <img src='assets/images/globe.png'/>
                     <br/>
                     <br/>
-                    <font size="+2"><b><a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'>ArcGIS Viewer for Flex</a></b></font>
+                    <font size="+2"><b><a href="http://resourcesbeta.arcgis.com/en/communities/flex-viewer/" target='_blank'>ArcGIS Viewer for Flex</a></b></font>
                 </p>
            ]]>
         </content>
diff --git a/src/widgets/HeaderController/HeaderGroup.mxml b/src/widgets/HeaderController/HeaderGroup.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/HeaderController/HeaderGroupSkin.mxml b/src/widgets/HeaderController/HeaderGroupSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/HeaderController/WidgetItem.as b/src/widgets/HeaderController/WidgetItem.as
old mode 100644
new mode 100755
diff --git a/src/widgets/HeaderController/WidgetItemDataGroup.as b/src/widgets/HeaderController/WidgetItemDataGroup.as
old mode 100644
new mode 100755
diff --git a/src/widgets/HeaderController/WidgetItemDataGroupRenderer.mxml b/src/widgets/HeaderController/WidgetItemDataGroupRenderer.mxml
old mode 100644
new mode 100755
index 4d0f1ca..6685a6d
--- a/src/widgets/HeaderController/WidgetItemDataGroupRenderer.mxml
+++ b/src/widgets/HeaderController/WidgetItemDataGroupRenderer.mxml
@@ -87,13 +87,13 @@
               gap="2"
               horizontalAlign="center"
               verticalAlign="middle">
-        <mx:Image id="icon"
-                  width="25" height="100%"
-                  buttonMode="true"
-                  mouseOut="mouseOutHandler(event)"
-                  mouseOver="mouseOverHandler(event)"
-                  smoothBitmapContent="true"
-                  useHandCursor="true"/>
+        <s:Image id="icon"
+                 width="25" height="100%"
+                 buttonMode="true"
+                 mouseOut="mouseOutHandler(event)"
+                 mouseOver="mouseOverHandler(event)"
+                 smooth="true"
+                 useHandCursor="true"/>
         <HeaderController:WidgetUnderline id="underline"/>
     </s:VGroup>
 
diff --git a/src/widgets/HeaderController/WidgetListDataGroup.as b/src/widgets/HeaderController/WidgetListDataGroup.as
old mode 100644
new mode 100755
diff --git a/src/widgets/HeaderController/WidgetListItemRenderer.mxml b/src/widgets/HeaderController/WidgetListItemRenderer.mxml
old mode 100644
new mode 100755
index 125b314..e28a893
--- a/src/widgets/HeaderController/WidgetListItemRenderer.mxml
+++ b/src/widgets/HeaderController/WidgetListItemRenderer.mxml
@@ -84,8 +84,9 @@
                   verticalAlign="middle">
             <s:VGroup width="25" height="30"
                       horizontalAlign="center">
-                <mx:Image id="icon"
-                          width="100%" height="100%"/>
+                <s:Image id="icon"
+                         width="100%" height="100%"
+                         smooth="true"/>
                 <HeaderController:WidgetUnderline id="underline"/>
             </s:VGroup>
             <s:Label id="widgetLabel"
diff --git a/src/widgets/HeaderController/WidgetUnderline.mxml b/src/widgets/HeaderController/WidgetUnderline.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/InfoTemplates/IWTTrees.xml b/src/widgets/InfoTemplates/IWTTrees.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/InfoTemplates/IWT_311.xml b/src/widgets/InfoTemplates/IWT_311.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/InfoTemplates/IWT_Fires.xml b/src/widgets/InfoTemplates/IWT_Fires.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/InfoTemplates/IWT_Hurricanes.xml b/src/widgets/InfoTemplates/IWT_Hurricanes.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/InfoTemplates/IWT_IncidentAreas.xml b/src/widgets/InfoTemplates/IWT_IncidentAreas.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/InfoTemplates/IWT_IncidentPoints.xml b/src/widgets/InfoTemplates/IWT_IncidentPoints.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/InfoTemplates/InfoContentItemRenderer.mxml b/src/widgets/InfoTemplates/InfoContentItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/InfoTemplates/InfoPopupWidget.mxml b/src/widgets/InfoTemplates/InfoPopupWidget.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/InfoTemplates/SimpleInfoWinWidget.mxml b/src/widgets/InfoTemplates/SimpleInfoWinWidget.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/LayerList/LayerListWidget.mxml b/src/widgets/LayerList/LayerListWidget.mxml
old mode 100644
new mode 100755
index 9e06ec0..cbba45e
--- a/src/widgets/LayerList/LayerListWidget.mxml
+++ b/src/widgets/LayerList/LayerListWidget.mxml
@@ -54,6 +54,7 @@
                 toc.map = map;
                 toc.isMapServiceOnly = false; //gotta get this from the config file
                 toc.excludeLayers = getExcludeLayers();
+                toc.basemapLayers = getBasemapLayers();
                 toc.excludeGraphicsLayers = true;
                 if (expandLayerItems)
                 {
@@ -63,16 +64,7 @@
 
             private function getExcludeLayers():ArrayCollection
             {
-                var result:ArrayCollection = new ArrayCollection();
-
-                if (configData && configData.basemaps)
-                {
-                    // exclude basemaps
-                    for (var i:int = 0; i < configData.basemaps.length; i++)
-                    {
-                        result.addItem(configData.basemaps[i].label);
-                    }
-                }
+                var result:ArrayCollection = getBasemapLayers();
 
                 if (configXML)
                 {
@@ -86,6 +78,21 @@
 
                 return result;
             }
+
+            private function getBasemapLayers():ArrayCollection
+            {
+                var result:ArrayCollection = new ArrayCollection();
+
+                if (configData && configData.basemaps)
+                {
+                    for (var i:int = 0; i < configData.basemaps.length; i++)
+                    {
+                        result.addItem(configData.basemaps[i].label);
+                    }
+                }
+
+                return result;
+            }
         ]]>
     </fx:Script>
     <viewer:WidgetTemplate id="wTemplate"
diff --git a/src/widgets/LayerList/LayerListWidget.xml b/src/widgets/LayerList/LayerListWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Legend/LegendWidget.mxml b/src/widgets/Legend/LegendWidget.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Legend/LegendWidget.xml b/src/widgets/Legend/LegendWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Locate/AddressField.as b/src/widgets/Locate/AddressField.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Locate/LocateResult.as b/src/widgets/Locate/LocateResult.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Locate/LocateResultDataGroup.as b/src/widgets/Locate/LocateResultDataGroup.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Locate/LocateResultItemRenderer.mxml b/src/widgets/Locate/LocateResultItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Locate/LocateWidget.mxml b/src/widgets/Locate/LocateWidget.mxml
old mode 100644
new mode 100755
index e2cfaa0..96e245f
--- a/src/widgets/Locate/LocateWidget.mxml
+++ b/src/widgets/Locate/LocateWidget.mxml
@@ -42,16 +42,16 @@
             import com.esri.ags.Map;
             import com.esri.ags.geometry.MapPoint;
             import com.esri.ags.layers.GraphicsLayer;
+            import com.esri.ags.portal.PopUpRenderer;
+            import com.esri.ags.portal.supportClasses.PopUpInfo;
             import com.esri.ags.symbols.PictureMarkerSymbol;
             import com.esri.ags.symbols.Symbol;
+            import com.esri.ags.tasks.JSONTask;
             import com.esri.ags.tasks.supportClasses.AddressCandidate;
             import com.esri.ags.tasks.supportClasses.AddressToLocationsParameters;
             import com.esri.ags.utils.WebMercatorUtil;
             import com.esri.ags.virtualearth.VEGeocodeResult;
-            import com.esri.ags.webmap.PopUpRenderer;
-            import com.esri.ags.webmap.supportClasses.PopUpInfo;
             import com.esri.viewer.utils.ErrorMessageUtil;
-            import com.esri.viewer.utils.GenericJSONTask;
 
             import mx.collections.ArrayCollection;
             import mx.collections.ArrayList;
@@ -106,7 +106,7 @@
             [Bindable]
             private var yExampleValue:String;
 
-            private var locatorService:GenericJSONTask;
+            private var locatorService:JSONTask;
             private var addrObjects:Array = [];
             private var excludeFields:Array;
             private var graphicsLayer:GraphicsLayer;
@@ -119,6 +119,7 @@
             private var useSingleLine:Boolean = true;
             private var zoomScale:Number = 10000;
             private var serviceWKID:Number;
+            private var useSearchExtent:Boolean;
 
             private var popUpRenderer:PopUpRenderer = new PopUpRenderer();
 
@@ -145,6 +146,7 @@
                     }
 
                     minscore = Number(configXML.minscore) || 40;
+                    useSearchExtent = configXML.usesearchextent == "true";
 
                     configureLocator();
                 }
@@ -192,7 +194,6 @@
                 resultSymbol = new PictureMarkerSymbol(resultSymbolURL, resultSymbolWidth, resultSymbolHeight, resultSymbolXOffset, resultSymbolYOffset);
             }
 
-
             private function configureGraphicsLayer():void
             {
                 graphicsLayer = new GraphicsLayer();
@@ -265,7 +266,7 @@
                     }
 
                     var url:String = configXML.locator;
-                    locatorService = new GenericJSONTask();
+                    locatorService = new JSONTask();
                     locatorService.url = url;
                     locator.url = url;
 
@@ -364,17 +365,10 @@
                     + "Most likely cause:\n"
                     + ErrorMessageUtil.getKnownErrorCauseMessage(fault.faultCode) + "\n\n"
                     + "Details:\n"
-                    + makeHTMLSafe(fault.toString());
+                    + ErrorMessageUtil.makeHTMLSafe(fault.toString());
                 showError(msg);
             }
 
-            private function makeHTMLSafe(content:String):String
-            {
-                content = content.replace(/>/g, "&gt;");
-                content = content.replace(/</g, "&lt;");
-                return content;
-            }
-
             private function createSingleLineAddressField(singleLineAddressData:Object):void
             {
                 var singleAddressLabel:Label = new Label();
@@ -602,6 +596,10 @@
                 showStateResults();
                 var parameters:AddressToLocationsParameters = new AddressToLocationsParameters();
                 parameters.address = data;
+                if (useSearchExtent)
+                {
+                    parameters.searchExtent = map.extent;
+                }
                 locator.addressToLocations(parameters, new ItemResponder(locateResult, locateError));
                 showMessage(loadingLabel, true);
             }
@@ -719,27 +717,35 @@
                     var lat:String = txtLat.text;
                     if (long && lat)
                     {
-                        showStateResults();
-
-                        var locateResult:LocateResult = new LocateResult();
-                        locateResult.symbol = resultSymbol;
-                        locateResult.title = coordinatesLabel;
-                        locateResult.content = long + " " + lat;
-                        locateResult.point = new MapPoint(Number(long), Number(lat));
-                        var mapWKID:Number = map.spatialReference ? map.spatialReference.wkid : NaN;
-                        var mapIsWebMercator:Boolean = mapWKID == 102100 || mapWKID == 3857 || mapWKID == 102113;
-                        if (mapIsWebMercator)
+                        var numLong:Number = Number(long);
+                        var numLat:Number = Number(lat);
+                        if (!isNaN(numLong) && !isNaN(numLat))
                         {
-                            locateResult.point = WebMercatorUtil.geographicToWebMercator(locateResult.point) as MapPoint;
-                        }
-                        locateResult.link = "";
-                        locateResult.selected = true;
+                            showStateResults();
 
-                        locateResultAC = new ArrayCollection([ locateResult ]);
+                            var locateResult:LocateResult = new LocateResult();
+                            locateResult.symbol = resultSymbol;
+                            locateResult.title = coordinatesLabel;
+                            locateResult.content = long + " " + lat;
+                            locateResult.point = new MapPoint(numLong, numLat);
+                            var mapWKID:Number = map.spatialReference ? map.spatialReference.wkid : NaN;
+                            var mapIsWebMercator:Boolean = mapWKID == 102100 || mapWKID == 3857 || mapWKID == 102113;
+                            if (mapIsWebMercator)
+                            {
+                                // clip the locate result, so it's not going to Infinity; otherwise gives an error                           
+                                locateResult.point.x = Math.min(Math.max(locateResult.point.x, -180), 180);
+                                locateResult.point.y = Math.min(Math.max(locateResult.point.y, -89.99), 89.99);
+                                locateResult.point = WebMercatorUtil.geographicToWebMercator(locateResult.point) as MapPoint;
+                            }
+                            locateResult.link = "";
+                            locateResult.selected = true;
+
+                            locateResultAC = new ArrayCollection([ locateResult ]);
 
-                        addSharedData(widgetTitle, locateResultAC);
-                        showLocation(locateResult);
-                        showMessage(locationsLabel + " " + locateResultAC.length, false);
+                            addSharedData(widgetTitle, locateResultAC);
+                            showLocation(locateResult);
+                            showMessage(locationsLabel + " " + locateResultAC.length, false);
+                        }
                     }
                     else
                     {
diff --git a/src/widgets/Locate/LocateWidget.xml b/src/widgets/Locate/LocateWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Locate/LocateWidget_Bing.xml b/src/widgets/Locate/LocateWidget_Bing.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Locate/LocateWidget_Canada.xml b/src/widgets/Locate/LocateWidget_Canada.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Locate/LocateWidget_EU.xml b/src/widgets/Locate/LocateWidget_EU.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Locate/LocateWidget_NA.xml b/src/widgets/Locate/LocateWidget_NA.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Locate/LocateWidget_RanchoCucamonga.xml b/src/widgets/Locate/LocateWidget_RanchoCucamonga.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Locate/LocateWidget_US.xml b/src/widgets/Locate/LocateWidget_US.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Locate/LocateWidget_WorldGaz.xml b/src/widgets/Locate/LocateWidget_WorldGaz.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/MapSwitcher/Basemap.as b/src/widgets/MapSwitcher/Basemap.as
old mode 100644
new mode 100755
diff --git a/src/widgets/MapSwitcher/BasemapItemRenderer.mxml b/src/widgets/MapSwitcher/BasemapItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/MapSwitcher/MapSwitcherWidget.mxml b/src/widgets/MapSwitcher/MapSwitcherWidget.mxml
old mode 100644
new mode 100755
index e2d0c43..0a0a6cf
--- a/src/widgets/MapSwitcher/MapSwitcherWidget.mxml
+++ b/src/widgets/MapSwitcher/MapSwitcherWidget.mxml
@@ -39,6 +39,7 @@
 
             private var expandLayerItems:Boolean;
             private var basemapSelectionComponent:ListBase;
+            private var previousConfigBasemapsTotal:int;
 
             [Bindable]
             private var shouldShowOpLayers:Boolean;
@@ -121,6 +122,7 @@
                         basemapList.addItem(basemapItem);
                     }
                 }
+                previousConfigBasemapsTotal = configData.basemaps.length;
             }
 
             private function setWidgetState(showThumbnails:Boolean):void
@@ -172,6 +174,7 @@
                 toc.map = map;
                 toc.isMapServiceOnly = false; //gotta get this from the config file
                 toc.excludeLayers = getExcludeLayers();
+                toc.basemapLayers = getBasemapLayers();
                 toc.excludeGraphicsLayers = true;
                 if (expandLayerItems)
                 {
@@ -181,16 +184,7 @@
 
             private function getExcludeLayers():ArrayCollection
             {
-                var excludeLayers:ArrayCollection = new ArrayCollection();
-
-                if (configData && configData.basemaps)
-                {
-                    // exclude basemaps
-                    for (var i:int = 0; i < configData.basemaps.length; i++)
-                    {
-                        excludeLayers.addItem(configData.basemaps[i].label);
-                    }
-                }
+                var excludeLayers:ArrayCollection = getBasemapLayers();
 
                 if (configXML)
                 {
@@ -205,6 +199,21 @@
                 return excludeLayers;
             }
 
+            private function getBasemapLayers():ArrayCollection
+            {
+                var result:ArrayCollection = new ArrayCollection();
+
+                if (configData && configData.basemaps)
+                {
+                    for (var i:int = 0; i < configData.basemaps.length; i++)
+                    {
+                        result.addItem(configData.basemaps[i].label);
+                    }
+                }
+
+                return result;
+            }
+
             private function startHideTimer():void
             {
                 hideOpLayersTimer.reset();
@@ -270,6 +279,12 @@
 
             private function basemapsButton_rollOverHandler(event:MouseEvent):void
             {
+                var haveBasemapsChanged:Boolean = (previousConfigBasemapsTotal != configData.basemaps.length);
+                if (haveBasemapsChanged)
+                {
+                    initBasemapList();
+                }
+
                 shouldShowOpLayers = false;
                 shouldShowBasemaps = true;
                 hideBasemapsTimer.reset();
@@ -300,12 +315,14 @@
                   rollOut="startHideTimer()"
                   rollOver="opLayerListButton_rollOverHandler(event)"
                   visible="false"/>
+
         <s:ButtonBar id="basemapsButtonBar"
                      change="dispatchChangeBasemapEvent()"
                      dataProvider="{basemapList}"
                      includeIn="buttonOptions"
                      labelField="label"
                      requireSelection="true"/>
+
         <s:Button id="basemapsButton"
                   includeIn="thumbnailOptions"
                   label="{basemapsLabel}"
@@ -313,6 +330,7 @@
                   rollOver="basemapsButton_rollOverHandler(event)"
                   skinClass="com.esri.viewer.skins.BasemapsButtonSkin"/>
     </s:HGroup>
+
     <s:BorderContainer id="opLayersContainer"
                        width="265" height="180"
                        backgroundColor="{getStyle('contentBackgroundColor')}"
@@ -324,6 +342,7 @@
         <toc:TOC id="toc"
                  left="2" right="2" top="3" bottom="3"/>
     </s:BorderContainer>
+
     <s:BorderContainer id="basemapsContainer"
                        backgroundColor="{getStyle('contentBackgroundColor')}"
                        includeIn="thumbnailOptions"
diff --git a/src/widgets/MapSwitcher/MapSwitcherWidget.xml b/src/widgets/MapSwitcher/MapSwitcherWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/IconButton.as b/src/widgets/Navigation/IconButton.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/IconButtonSkin.mxml b/src/widgets/Navigation/IconButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/InnerButtonSkin.mxml b/src/widgets/Navigation/InnerButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/NavToolItem.as b/src/widgets/Navigation/NavToolItem.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/Navigation.mxml b/src/widgets/Navigation/Navigation.mxml
old mode 100644
new mode 100755
index 0d28c54..57a7729
--- a/src/widgets/Navigation/Navigation.mxml
+++ b/src/widgets/Navigation/Navigation.mxml
@@ -52,7 +52,6 @@
             [Bindable]
             public var panrightItem:NavToolItem;
 
-
             [Bindable]
             public var prevextItem:NavToolItem;
 
@@ -129,7 +128,9 @@
                             blurX="10"
                             blurY="10"/>
     </s:filters>
-    <s:Group includeInLayout="{panwheelItem.toolVisible}" visible="{panwheelItem.toolVisible}">
+    <s:Group includeInLayout="{panwheelItem.toolVisible}"
+             layoutDirection="ltr"
+             visible="{panwheelItem.toolVisible}">
         <s:Button id="nwButton"
                   x="2" y="2"
                   click="map.panUpperLeft()"
diff --git a/src/widgets/Navigation/NavigationSkin.mxml b/src/widgets/Navigation/NavigationSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/NavigationWidget.mxml b/src/widgets/Navigation/NavigationWidget.mxml
old mode 100644
new mode 100755
index 2566b0f..d5a1ac4
--- a/src/widgets/Navigation/NavigationWidget.mxml
+++ b/src/widgets/Navigation/NavigationWidget.mxml
@@ -89,7 +89,6 @@
         ]]>
     </fx:Script>
     <Navigation:Navigation id="navigation"
-                           layoutDirection="ltr"
                            map="{map}"
                            rollOut="{rollOutFade.play()}"
                            rollOver="{rollOverFade.play()}"
diff --git a/src/widgets/Navigation/NavigationWidget.xml b/src/widgets/Navigation/NavigationWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/VerticalButtonBarSkin.mxml b/src/widgets/Navigation/VerticalButtonBarSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/eButtonSkin.mxml b/src/widgets/Navigation/eButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/nButtonSkin.mxml b/src/widgets/Navigation/nButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/neButtonSkin.mxml b/src/widgets/Navigation/neButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/nwButtonSkin.mxml b/src/widgets/Navigation/nwButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/sButtonSkin.mxml b/src/widgets/Navigation/sButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/seButtonSkin.mxml b/src/widgets/Navigation/seButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/swButtonSkin.mxml b/src/widgets/Navigation/swButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Navigation/wButtonSkin.mxml b/src/widgets/Navigation/wButtonSkin.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/OverviewMap/ExpansionDirection.as b/src/widgets/OverviewMap/ExpansionDirection.as
old mode 100644
new mode 100755
diff --git a/src/widgets/OverviewMap/OverviewMapComponent.mxml b/src/widgets/OverviewMap/OverviewMapComponent.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/OverviewMap/OverviewMapWidget.mxml b/src/widgets/OverviewMap/OverviewMapWidget.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/OverviewMap/OverviewMapWidget.xml b/src/widgets/OverviewMap/OverviewMapWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Print/ExportWebMapForm.mxml b/src/widgets/Print/ExportWebMapForm.mxml
old mode 100644
new mode 100755
index 3628398..03db266
--- a/src/widgets/Print/ExportWebMapForm.mxml
+++ b/src/widgets/Print/ExportWebMapForm.mxml
@@ -10,11 +10,17 @@
         <![CDATA[
             import com.esri.ags.events.PrintEvent;
             import com.esri.ags.events.ZoomEvent;
+            import com.esri.ags.layers.FeatureLayer;
+            import com.esri.ags.layers.GraphicsLayer;
+            import com.esri.ags.layers.Layer;
             import com.esri.ags.tasks.supportClasses.DataFile;
             import com.esri.ags.tasks.supportClasses.JobInfo;
+            import com.esri.ags.tasks.supportClasses.LegendLayer;
+            import com.esri.ags.tasks.supportClasses.LegendOptions;
             import com.esri.ags.tasks.supportClasses.ParameterValue;
             import com.esri.ags.tasks.supportClasses.PrintServiceInfo;
             import com.esri.viewer.BaseWidget;
+            import com.esri.viewer.utils.ErrorMessageUtil;
 
             import mx.collections.IList;
             import mx.rpc.events.FaultEvent;
@@ -80,6 +86,7 @@
                 layoutOptions.title = txtTitle.text;
                 layoutOptions.author = txtAuthor.text;
                 layoutOptions.copyright = txtCopyright.text;
+                layoutOptions.legendOptions = getLegendOptions();
 
                 var oldscale:Number;
                 var oldLODs:Array;
@@ -108,6 +115,39 @@
                 }
             }
 
+            private function getLegendOptions():LegendOptions
+            {
+                var result:LegendOptions = new LegendOptions();
+                var legendLayers:Array = [];
+
+                for each (var layer:Layer in hostBaseWidget.map.layers)
+                {
+                    if (layer.name.indexOf("hiddenLayer_") == -1 && !(layer is GraphicsLayer && !(layer is FeatureLayer)))
+                    {
+
+                        var isBaseMapLayer:Boolean = false;
+                        for each (var baseMapLayer:Object in hostBaseWidget.configData.basemaps)
+                        {
+                            if (baseMapLayer.label == layer.id)
+                            {
+                                isBaseMapLayer = true;
+                                break;
+                            }
+                        }
+                        if (!isBaseMapLayer)
+                        {
+                            var legendLayer:LegendLayer = new LegendLayer();
+                            legendLayer.layerId = layer.id;
+                            legendLayers.push(legendLayer);
+                        }
+                    }
+                }
+
+                result.legendLayers = legendLayers;
+
+                return result;
+            }
+
             private function map_zoomEndHandler(event:ZoomEvent):void
             {
                 if (!scaleCheckbox.selected)
@@ -131,7 +171,7 @@
 
             protected function printTask_faultHandler(event:FaultEvent):void
             {
-                hostBaseWidget.showError(event.fault.faultString);
+                hostBaseWidget.showError("Error executing print task:\n\n" + ErrorMessageUtil.makeHTMLSafe(event.fault.toString()));
                 swfMessage.visible = false;
             }
 
@@ -156,45 +196,52 @@
 
             private function initTitle():void
             {
+                shouldShowTitle = true;
+                titleFI.label = configXML.labels.titlelabel[0] || hostBaseWidget.getDefaultString("printTitleLabel");
+
                 if (configXML.title[0])
                 {
                     title = configXML.title[0] || hostBaseWidget.getDefaultString("printTitle");
-                    titleFI.label = configXML.labels.titlelabel[0] || hostBaseWidget.getDefaultString("printTitleLabel");
-                    if (configXML.title[0].@visible[0] != "false")
+                    if (configXML.title[0].@visible[0] == "false")
                     {
-                        shouldShowTitle = true;
+                        shouldShowTitle = false;
                     }
                 }
             }
 
             private function initCopyright():void
             {
+                shouldShowCopyright = true;
+                copyrightFI.label = configXML.labels.copyrightlabel[0] || hostBaseWidget.getDefaultString("printCopyrightLabel");
+
                 if (configXML.copyright[0])
                 {
                     copyright = configXML.copyright.@defaultvalue[0] || configXML.copyright[0] || hostBaseWidget.getDefaultString("printCopyright");
-                    copyrightFI.label = configXML.labels.copyrightlabel[0] || hostBaseWidget.getDefaultString("printCopyrightLabel");
-                    if (configXML.copyright[0].@visible[0] != "false")
+                    if (configXML.copyright[0].@visible[0] == "false")
                     {
-                        shouldShowCopyright = true;
+                        shouldShowCopyright = false;
                     }
                 }
             }
 
             private function initAuthor():void
             {
+                shouldShowAuthor = true;
+                authorFI.label = configXML.labels.authorlabel[0] || hostBaseWidget.getDefaultString("printAuthorLabel");
+
                 if (configXML.author[0])
                 {
                     author = configXML.author[0] || hostBaseWidget.getDefaultString("printAuthor");
-                    authorFI.label = configXML.labels.authorlabel[0] || hostBaseWidget.getDefaultString("printAuthorLabel");
-                    if (configXML.author[0].@visible[0] != "false")
+                    if (configXML.author[0].@visible[0] == "false")
                     {
-                        shouldShowAuthor = true;
+                        shouldShowAuthor = false;
                     }
                 }
             }
 
             private function initUseScale():void
             {
+                shouldShowUseScale = true;
                 scaleCheckbox.label = configXML.labels.scalelabel[0] || hostBaseWidget.getDefaultString("printScaleLabel");
                 hostBaseWidget.map.addEventListener(ZoomEvent.ZOOM_END, map_zoomEndHandler, false, 0, true);
                 updatePrintScale();
@@ -209,47 +256,59 @@
                         scaleInput.text = scaleDefaultValue.toString();
                     }
 
-                    if (configXML.usescale[0].@visible[0] != 'false')
+                    if (configXML.usescale[0].@visible[0] == 'false')
                     {
-                        shouldShowUseScale = true;
+                        shouldShowUseScale = false;
                     }
                 }
             }
 
             private function initLayoutTemplates(serviceInfo:PrintServiceInfo):void
             {
+                var layoutTemplatesVisibility:Boolean = true;
+                layoutTemplatesFI.label = configXML.labels.layouttemplateslabel[0] || hostBaseWidget.getDefaultString("printLayoutTemplatesLabel");
+                var layoutTemplates:IList = serviceInfo.layoutTemplates;
+
                 if (configXML.layouttemplates[0])
                 {
                     printParameters.layoutTemplate = configXML.layouttemplates.@defaultvalue[0] || configXML.layouttemplates[0];
+                    layoutTemplatesVisibility = configXML.layouttemplates[0].@visible[0] != "false";
                 }
-                layoutTemplatesFI.label = configXML.labels.layouttemplateslabel[0] || hostBaseWidget.getDefaultString("printLayoutTemplatesLabel");
-
-                var layoutTemplates:IList = serviceInfo.layoutTemplates;
-                shouldShowTemplateOptions = (layoutTemplates && layoutTemplates.length > 1);
+                shouldShowTemplateOptions = layoutTemplatesVisibility && (layoutTemplates && layoutTemplates.length > 1);
 
                 var shouldUseServiceInfoDefault:Boolean = (!printParameters.layoutTemplate && serviceInfo.defaultLayoutTemplate);
                 if (shouldUseServiceInfoDefault)
                 {
                     layoutTemplatesDDL.selectedItem = serviceInfo.defaultLayoutTemplate;
                 }
+                else if (printParameters.layoutTemplate)
+                {
+                    layoutTemplatesDDL.selectedItem = printParameters.layoutTemplate;
+                }
             }
 
             private function initFormats(serviceInfo:PrintServiceInfo):void
             {
+                var formatsVisibility:Boolean = true;
+                formatsFI.label = configXML.labels.formatslabel[0] || hostBaseWidget.getDefaultString("printFormatsLabel");
+                var formats:IList = serviceInfo.formats;
+
                 if (configXML.formats[0])
                 {
                     printParameters.format = configXML.formats.@defaultvalue[0] || configXML.formats[0];
+                    formatsVisibility = configXML.formats[0].@visible[0] != "false";
                 }
-                formatsFI.label = configXML.labels.formatslabel[0] || hostBaseWidget.getDefaultString("printFormatsLabel");
-
-                var formats:IList = serviceInfo.formats;
-                shouldShowFormatOptions = (formats && formats.length > 1);
+                shouldShowFormatOptions = formatsVisibility && (formats && formats.length > 1);
 
                 var shouldUseServiceInfoDefault:Boolean = (!printParameters.format && serviceInfo.defaultFormat);
                 if (shouldUseServiceInfoDefault)
                 {
                     formatsDDL.selectedItem = serviceInfo.defaultFormat;
                 }
+                else if (printParameters.format)
+                {
+                    formatsDDL.selectedItem = printParameters.format;
+                }
             }
 
             private function printTask_jobCompleteHandler(event:PrintEvent):void
@@ -280,11 +339,7 @@
                               map="{hostBaseWidget.map}"
                               preserveScale="{scaleCheckbox.selected}">
             <esri:layoutOptions>
-                <esri:LayoutOptions id="layoutOptions">
-                    <esri:legendOptions>
-                        <esri:LegendOptions layerIds="{hostBaseWidget.map.layerIds}"/>
-                    </esri:legendOptions>
-                </esri:LayoutOptions>
+                <esri:LayoutOptions id="layoutOptions"/>
             </esri:layoutOptions>
         </esri:PrintParameters>
     </fx:Declarations>
diff --git a/src/widgets/Print/IPrintWidgetComponent.as b/src/widgets/Print/IPrintWidgetComponent.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Print/PrintWidget.mxml b/src/widgets/Print/PrintWidget.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Print/PrintWidget.xml b/src/widgets/Print/PrintWidget.xml
old mode 100644
new mode 100755
index 0d9b367..b202e38
--- a/src/widgets/Print/PrintWidget.xml
+++ b/src/widgets/Print/PrintWidget.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <configuration>
     <!-- change this URL to your own Export Web Map Task (requires ArcGIS Server 10.1), or just remove the taskurl tag to get quick printing -->
-    <taskurl>http://servicesbeta4.esri.com/arcgis/rest/services/Utilities/ExportWebMap/GPServer/Export%20Web%20Map%20Task</taskurl>
+    <taskurl>http://sampleserver6.arcgisonline.com/ArcGIS/rest/services/Utilities/PrintingTools/GPServer/Export%20Web%20Map%20Task</taskurl>
 </configuration>
 
 <!--
diff --git a/src/widgets/Print/PrintWidget_exportlessoptions.xml b/src/widgets/Print/PrintWidget_exportlessoptions.xml
deleted file mode 100644
index b702899..0000000
--- a/src/widgets/Print/PrintWidget_exportlessoptions.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<configuration>
-    <taskurl>http://107.20.28.73:6080/arcgis/rest/services/Utilities/ExportWebMap/GPServer/Export%20Web%20Map%20Task</taskurl>
-    <layouttemplates defaultvalue="Landscape A0"/>
-    <formats defaultvalue="PDF"/>>
-    <title visible="false"/>
-    <author visible="false"/>
-    <usescale visible="false"/>
-    <labels>
-        <submitlabel>Save map</submitlabel>
-    </labels>
-</configuration>
-
-<!--
-    See Print widget tag reference at
-    http://links.esri.com/printwidget
--->
diff --git a/src/widgets/Print/PrintWidget_exportoptions.xml b/src/widgets/Print/PrintWidget_exportoptions.xml
deleted file mode 100644
index dd6c062..0000000
--- a/src/widgets/Print/PrintWidget_exportoptions.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" ?>
-<configuration>
-    <!--taskurl>http://rags2k8411r2:6080/arcgis/rest/services/Utilities/ExportWebMap/GPServer/Export%20Web%20Map%20Task</taskurl-->
-    <taskurl>http://107.20.28.73:6080/arcgis/rest/services/Utilities/ExportWebMap/GPServer/Export%20Web%20Map%20TaskXXXX</taskurl>
-</configuration>
-
-<!--
-    See Print widget tag reference at
-    http://links.esri.com/printwidget
--->
diff --git a/src/widgets/Print/ScreenPrintForm.mxml b/src/widgets/Print/ScreenPrintForm.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Query/QueryResult.as b/src/widgets/Query/QueryResult.as
deleted file mode 100644
index 34a9b5e..0000000
--- a/src/widgets/Query/QueryResult.as
+++ /dev/null
@@ -1,46 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010-2011 Esri. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-///////////////////////////////////////////////////////////////////////////
-package widgets.Query
-{
-
-import com.esri.ags.Graphic;
-import com.esri.ags.geometry.Geometry;
-import com.esri.ags.geometry.MapPoint;
-import com.esri.ags.symbols.Symbol;
-
-import flash.events.EventDispatcher;
-
-[Bindable]
-
-public dynamic class QueryResult extends EventDispatcher
-{
-    public var title:String;
-
-    public var symbol:Symbol;
-
-    public var content:String;
-
-    public var point:MapPoint;
-
-    public var link:String;
-
-    public var geometry:Geometry;
-
-    public var graphic:Graphic;
-
-}
-
-}
diff --git a/src/widgets/Query/QueryResultDataGroup.as b/src/widgets/Query/QueryResultDataGroup.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Query/QueryResultItemRenderer.mxml b/src/widgets/Query/QueryResultItemRenderer.mxml
old mode 100644
new mode 100755
index 1a0ecd3..43eff8e
--- a/src/widgets/Query/QueryResultItemRenderer.mxml
+++ b/src/widgets/Query/QueryResultItemRenderer.mxml
@@ -35,21 +35,23 @@
 
             import spark.components.Application;
 
-            private const QUERY_RESULT_CLICK:String = "queryResultClick";
+            import widgets.supportClasses.ResultAttributes;
+            import widgets.supportClasses.ResultItem;
 
+            private const QUERY_RESULT_CLICK:String = "queryResultClick";
             private const QUERY_RESULT_MOUSE_OVER:String = "queryResultMouseOver";
-
             private const QUERY_RESULT_MOUSE_OUT:String = "queryResultMouseOut";
 
             [Bindable]
-            private var queryResult:QueryResult;
+            private var queryResultAttributes:ResultAttributes;
 
             private var lastResultSymbol:Symbol;
             private var lastResultSwatch:UIComponent;
 
             private function itemrenderer_dataChangeHandler(event:FlexEvent):void
             {
-                queryResult = data as QueryResult;
+                var queryResult:ResultItem = data as ResultItem;
+                queryResultAttributes = queryResult.attributes;
 
                 if (queryResult && queryResult.symbol)
                 {
@@ -92,7 +94,7 @@
             private function showLink(event:MouseEvent):void
             {
                 event.stopImmediatePropagation(); // don't dispatch QUERY_RESULT_CLICK since we don't want to zoom to feature
-                navigateToURL(new URLRequest(queryResult.link));
+                navigateToURL(new URLRequest(queryResultAttributes.link));
             }
 
             protected function resultLink_preinitializeHandler(event:FlexEvent):void
@@ -165,21 +167,21 @@
             <s:Label width="100%"
                      fontWeight="bold"
                      maxDisplayedLines="-1"
-                     text="{queryResult.title}"/>
+                     text="{queryResultAttributes.title}"/>
             <s:Label width="100%"
                      fontWeight="normal"
                      maxDisplayedLines="-1"
-                     text="{queryResult.content}"/>
+                     text="{queryResultAttributes.content}"/>
         </s:VGroup>
         <mx:Image id="resultLink"
                   width="18" height="18"
                   buttonMode="true"
                   click="showLink(event)"
-                  includeInLayout="{queryResult.link != null}"
+                  includeInLayout="{queryResultAttributes.link != null}"
                   preinitialize="resultLink_preinitializeHandler(event)"
                   source="assets/images/w_link.png"
-                  toolTip="{queryResult.link}"
+                  toolTip="{queryResultAttributes.link}"
                   useHandCursor="true"
-                  visible="{queryResult.link != null}"/>
+                  visible="{queryResultAttributes.link != null}"/>
     </s:HGroup>
 </s:ItemRenderer>
diff --git a/src/widgets/Query/QueryWidget.mxml b/src/widgets/Query/QueryWidget.mxml
old mode 100644
new mode 100755
index 0d27aad..f61800d
--- a/src/widgets/Query/QueryWidget.mxml
+++ b/src/widgets/Query/QueryWidget.mxml
@@ -42,9 +42,6 @@
             import com.esri.ags.events.LayerEvent;
             import com.esri.ags.geometry.Geometry;
             import com.esri.ags.geometry.MapPoint;
-            import com.esri.ags.geometry.Multipoint;
-            import com.esri.ags.geometry.Polygon;
-            import com.esri.ags.geometry.Polyline;
             import com.esri.ags.layers.FeatureLayer;
             import com.esri.ags.layers.GraphicsLayer;
             import com.esri.ags.layers.supportClasses.CodedValue;
@@ -57,9 +54,9 @@
             import com.esri.ags.symbols.SimpleLineSymbol;
             import com.esri.ags.symbols.Symbol;
             import com.esri.ags.tasks.supportClasses.Query;
-            import com.esri.ags.webmap.PopUpRenderer;
-            import com.esri.ags.webmap.supportClasses.PopUpInfo;
-            import com.esri.ags.webmap.supportClasses.PopUpMediaInfo;
+            import com.esri.ags.portal.PopUpRenderer;
+            import com.esri.ags.portal.supportClasses.PopUpInfo;
+            import com.esri.ags.portal.supportClasses.PopUpMediaInfo;
 
             import mx.collections.ArrayCollection;
             import mx.events.FlexEvent;
@@ -70,6 +67,9 @@
 
             import spark.components.supportClasses.ItemRenderer;
 
+            import widgets.supportClasses.ResultAttributes;
+            import widgets.supportClasses.ResultItem;
+
             private const ICON_URL:String = "assets/images/";
 
             [Bindable]
@@ -472,13 +472,12 @@
                         }
                     }
 
-                    var queryResult:QueryResult = new QueryResult();
-                    queryResult.title = title;
-                    queryResult.content = content;
-                    queryResult.point = getGeomCenter(graphic);
-                    queryResult.link = link ? link : null;
-                    queryResult.geometry = graphic.geometry;
-                    queryResult.graphic = graphic;
+                    var resultAttributes:ResultAttributes = new ResultAttributes();
+                    resultAttributes.title = title;
+                    resultAttributes.content = content;
+                    resultAttributes.link = link ? link : null;
+
+                    var queryResult:ResultItem = new ResultItem(graphic, resultAttributes);
 
                     if (graphic.geometry)
                     {
@@ -486,27 +485,27 @@
                         {
                             case Geometry.POLYLINE:
                             {
-                                graphic.symbol = queryResult.symbol = resultLineSymbol;
+                                graphic.symbol = resultLineSymbol;
                                 break;
                             }
                             case Geometry.POLYGON:
                             {
-                                graphic.symbol = queryResult.symbol = resultFillSymbol;
+                                graphic.symbol = resultFillSymbol;
                                 break;
                             }
                             case Geometry.MAPPOINT:
                             {
-                                graphic.symbol = queryResult.symbol = resultMarkerSymbol;
+                                graphic.symbol = resultMarkerSymbol;
                                 break;
                             }
                         }
                     }
 
                     graphic.checkForMouseListeners = false;
-                    graphic.attributes = queryResult;
+                    graphic.attributes = resultAttributes;
                     result.addItem(queryResult);
 
-                    if (queryResult.point && !isNaN(queryResult.point.x) && !isNaN(queryResult.point.y)) // make sure it is a valid point
+                    if (queryResult.center && !isNaN(queryResult.center.x) && !isNaN(queryResult.center.y)) // make sure it is a valid point
                     {
                         graphicsLayer.add(graphic);
                     }
@@ -675,56 +674,13 @@
                 return result;
             }
 
-            private function getGeomCenter(graphic:Graphic):MapPoint
-            {
-                var point:MapPoint;
-                var geometry:Geometry = graphic.geometry;
-
-                if (geometry)
-                {
-                    switch (geometry.type)
-                    {
-                        case Geometry.MAPPOINT:
-                        {
-                            point = geometry as MapPoint;
-                            break;
-                        }
-                        case Geometry.MULTIPOINT:
-                        {
-                            const multipoint:Multipoint = geometry as Multipoint;
-                            point = multipoint.points && multipoint.points.length > 0 ? multipoint.points[0] as MapPoint : null;
-                            break;
-                        }
-                        case Geometry.POLYLINE:
-                        {
-                            var pl:Polyline = geometry as Polyline;
-                            var pathCount:Number = pl.paths.length;
-                            var pathIndex:int = int((pathCount / 2) - 1);
-                            var midPath:Array = pl.paths[pathIndex];
-                            var ptCount:Number = midPath.length;
-                            var ptIndex:int = int((ptCount / 2) - 1);
-                            point = pl.getPoint(pathIndex, ptIndex);
-                            break;
-                        }
-                        case Geometry.POLYGON:
-                        {
-                            const poly:Polygon = geometry as Polygon;
-                            point = poly.extent.center;
-                            break;
-                        }
-                    }
-                }
-
-                return point;
-            }
-
             private var hitimer:uint;
 
             private function mouseOverQueryResult(event:Event):void
             {
                 clearTimeout(hitimer);
-                var queryResult:QueryResult = ItemRenderer(event.target).data as QueryResult;
-                if (map.extent.containsXY(queryResult.point.x, queryResult.point.y)) // only show infowindow if query result in contained within map extent
+                var queryResult:ResultItem = ItemRenderer(event.target).data as ResultItem;
+                if (map.extent.containsXY(queryResult.center.x, queryResult.center.y)) // only show infowindow if query result in contained within map extent
                 {
                     hitimer = setTimeout(showHighlight, 300, [ queryResult ]);
                 }
@@ -741,7 +697,7 @@
 
             private function clickQueryResult(event:Event):void
             {
-                var queryResult:QueryResult = ItemRenderer(event.target).data as QueryResult;
+                var queryResult:ResultItem = ItemRenderer(event.target).data as ResultItem;
                 if (queryResult.geometry)
                 {
                     if (queryResult.geometry.type == Geometry.MAPPOINT)
@@ -751,7 +707,7 @@
                             map.scale = zoomScale;
                         }
 
-                        map.centerAt(queryResult.point);
+                        map.centerAt(queryResult.center);
                     }
                     else
                     {
@@ -769,10 +725,11 @@
 
             private function showHighlight(params:Array):void
             {
-                var showHighlightPoint:MapPoint = params[0].point as MapPoint;
+                var queryResult:ResultItem = params[0];
+                var showHighlightPoint:MapPoint = queryResult.center as MapPoint;
 
-                popUpRenderer.popUpInfo = configurePopUpInfo(params[0].graphic.attributes.link);
-                popUpRenderer.graphic = params[0].graphic;
+                popUpRenderer.popUpInfo = configurePopUpInfo(queryResult.attributes.link);
+                popUpRenderer.graphic = queryResult.graphic;
 
                 map.infoWindow.content = popUpRenderer;
                 map.infoWindow.contentOwner = popUpRenderer.graphic;
@@ -847,14 +804,14 @@
                 doFilter();
             }
 
-            private function filterGraphicLayer(item:Object):Boolean
+            private function filterGraphicLayer(graphic:Graphic):Boolean
             {
-                return QueryResult(Graphic(item).attributes).content.match(new RegExp(txtFilter.text, 'i')) != null;
+                return ResultAttributes(graphic.attributes).content.match(new RegExp(txtFilter.text, 'i')) != null;
             }
 
-            private function filterDataList(item:Object):Boolean
+            private function filterDataList(queryResult:ResultItem):Boolean
             {
-                return QueryResult(item).content.match(new RegExp(txtFilter.text, 'i')) != null;
+                return queryResult.attributes.content.match(new RegExp(txtFilter.text, 'i')) != null;
             }
 
             private function hideInfoWindow():void
diff --git a/src/widgets/Query/QueryWidget_Earthquakes.xml b/src/widgets/Query/QueryWidget_Earthquakes.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Query/QueryWidget_Louisville_PoliceStations.xml b/src/widgets/Query/QueryWidget_Louisville_PoliceStations.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Query/QueryWidget_Louisville_TrafficCams.xml b/src/widgets/Query/QueryWidget_Louisville_TrafficCams.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Samples/HelloWorld/HelloWorldWidget.mxml b/src/widgets/Samples/HelloWorld/HelloWorldWidget.mxml
old mode 100644
new mode 100755
index 4fc25af..0606b06
--- a/src/widgets/Samples/HelloWorld/HelloWorldWidget.mxml
+++ b/src/widgets/Samples/HelloWorld/HelloWorldWidget.mxml
@@ -40,6 +40,7 @@
         </viewer:layout>
 
         <s:Label id="lbl"
+                 width="100%"
                  fontSize="18"
                  fontStyle="italic"
                  fontWeight="bold"/>
diff --git a/src/widgets/Samples/HelloWorld/HelloWorldWidget.xml b/src/widgets/Samples/HelloWorld/HelloWorldWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Samples/TestOpenClose/TestOpenCloseWidget.mxml b/src/widgets/Samples/TestOpenClose/TestOpenCloseWidget.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Samples/TestOpenClose/TestOpenCloseWidget.xml b/src/widgets/Samples/TestOpenClose/TestOpenCloseWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Samples/ThematicQuery/InfoColumnChartItemRenderer.mxml b/src/widgets/Samples/ThematicQuery/InfoColumnChartItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Samples/ThematicQuery/InfoColumnChartWidget.mxml b/src/widgets/Samples/ThematicQuery/InfoColumnChartWidget.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Samples/ThematicQuery/MapSwitcherWidget_Thematic.xml b/src/widgets/Samples/ThematicQuery/MapSwitcherWidget_Thematic.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Samples/ThematicQuery/ThematicDataGroup.as b/src/widgets/Samples/ThematicQuery/ThematicDataGroup.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Samples/ThematicQuery/ThematicItemRenderer.mxml b/src/widgets/Samples/ThematicQuery/ThematicItemRenderer.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Samples/ThematicQuery/ThematicQueryResult.as b/src/widgets/Samples/ThematicQuery/ThematicQueryResult.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Samples/ThematicQuery/ThematicQueryWidget.mxml b/src/widgets/Samples/ThematicQuery/ThematicQueryWidget.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Samples/ThematicQuery/ThematicQueryWidget.xml b/src/widgets/Samples/ThematicQuery/ThematicQueryWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Search/SearchResult.as b/src/widgets/Search/SearchResult.as
deleted file mode 100644
index 2b1f138..0000000
--- a/src/widgets/Search/SearchResult.as
+++ /dev/null
@@ -1,47 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010-2011 Esri. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-///////////////////////////////////////////////////////////////////////////
-package widgets.Search
-{
-
-import com.esri.ags.Graphic;
-import com.esri.ags.geometry.Geometry;
-import com.esri.ags.geometry.MapPoint;
-import com.esri.ags.symbols.Symbol;
-
-import flash.events.EventDispatcher;
-
-[Bindable]
-
-public class SearchResult extends EventDispatcher
-{
-    public var title:String;
-
-    public var symbol:Symbol;
-
-    public var content:String;
-
-    public var point:MapPoint;
-
-    public var link:String;
-
-    public var linkAlias:String;
-
-    public var geometry:Geometry;
-
-    public var graphic:Graphic;
-}
-
-}
diff --git a/src/widgets/Search/SearchResultDataGroup.as b/src/widgets/Search/SearchResultDataGroup.as
old mode 100644
new mode 100755
diff --git a/src/widgets/Search/SearchResultItemRenderer.mxml b/src/widgets/Search/SearchResultItemRenderer.mxml
old mode 100644
new mode 100755
index 3bff625..9e79e4f
--- a/src/widgets/Search/SearchResultItemRenderer.mxml
+++ b/src/widgets/Search/SearchResultItemRenderer.mxml
@@ -35,21 +35,23 @@
 
             import spark.components.Application;
 
-            private const SEARCH_RESULT_CLICK:String = "searchResultClick";
+            import widgets.supportClasses.ResultAttributes;
+            import widgets.supportClasses.ResultItem;
 
+            private const SEARCH_RESULT_CLICK:String = "searchResultClick";
             private const SEARCH_RESULT_MOUSE_OVER:String = "searchResultMouseOver";
-
             private const SEARCH_RESULT_MOUSE_OUT:String = "searchResultMouseOut";
 
             [Bindable]
-            private var searchResult:SearchResult;
+            private var searchResultAttributes:ResultAttributes;
 
             private var lastResultSymbol:Symbol;
             private var lastResultSwatch:UIComponent;
 
             private function itemrenderer_dataChangeHandler(event:FlexEvent):void
             {
-                searchResult = data as SearchResult;
+                var searchResult:ResultItem = data as ResultItem;
+                searchResultAttributes = searchResult.attributes;
 
                 if (searchResult && searchResult.symbol)
                 {
@@ -92,7 +94,7 @@
             private function showLink(event:MouseEvent):void
             {
                 event.stopImmediatePropagation(); // don't dispatch SEARCH_RESULT_CLICK since we don't want to zoom to feature
-                navigateToURL(new URLRequest(searchResult.link));
+                navigateToURL(new URLRequest(searchResultAttributes.link));
             }
 
             protected function resultLink_preinitializeHandler(event:FlexEvent):void
@@ -165,21 +167,21 @@
             <s:Label width="100%"
                      fontWeight="bold"
                      maxDisplayedLines="1"
-                     text="{searchResult.title}"/>
+                     text="{searchResultAttributes.title}"/>
             <s:Label width="100%"
                      fontWeight="normal"
                      maxDisplayedLines="-1"
-                     text="{searchResult.content}"/>
+                     text="{searchResultAttributes.content}"/>
         </s:VGroup>
         <mx:Image id="resultLink"
                   width="18" height="18"
                   buttonMode="true"
                   click="showLink(event)"
-                  includeInLayout="{searchResult.link != null}"
+                  includeInLayout="{searchResultAttributes.link != null}"
                   preinitialize="resultLink_preinitializeHandler(event)"
                   source="assets/images/w_link.png"
-                  toolTip="{searchResult.link}"
+                  toolTip="{searchResultAttributes.link}"
                   useHandCursor="true"
-                  visible="{searchResult.link != null}"/>
+                  visible="{searchResultAttributes.link != null}"/>
     </s:HGroup>
 </s:ItemRenderer>
diff --git a/src/widgets/Search/SearchWidget.mxml b/src/widgets/Search/SearchWidget.mxml
old mode 100644
new mode 100755
index b8e500b..4964f2e
--- a/src/widgets/Search/SearchWidget.mxml
+++ b/src/widgets/Search/SearchWidget.mxml
@@ -49,7 +49,6 @@
             import com.esri.ags.geometry.Geometry;
             import com.esri.ags.geometry.MapPoint;
             import com.esri.ags.geometry.Polygon;
-            import com.esri.ags.geometry.Polyline;
             import com.esri.ags.layers.FeatureLayer;
             import com.esri.ags.layers.GraphicsLayer;
             import com.esri.ags.layers.supportClasses.CodedValue;
@@ -66,9 +65,9 @@
             import com.esri.ags.tasks.supportClasses.Query;
             import com.esri.ags.tools.DrawTool;
             import com.esri.ags.utils.GeometryUtil;
-            import com.esri.ags.webmap.PopUpRenderer;
-            import com.esri.ags.webmap.supportClasses.PopUpInfo;
-            import com.esri.ags.webmap.supportClasses.PopUpMediaInfo;
+            import com.esri.ags.portal.PopUpRenderer;
+            import com.esri.ags.portal.supportClasses.PopUpInfo;
+            import com.esri.ags.portal.supportClasses.PopUpMediaInfo;
             import com.esri.viewer.AppEvent;
 
             import mx.collections.ArrayCollection;
@@ -79,6 +78,9 @@
 
             import spark.components.supportClasses.ItemRenderer;
 
+            import widgets.supportClasses.ResultAttributes;
+            import widgets.supportClasses.ResultItem;
+
             private const ICON_URL:String = "assets/images/";
 
             private var configSearchGraphical:Array;
@@ -702,14 +704,13 @@
 
                     graphic.checkForMouseListeners = false;
 
-                    var searchResult:SearchResult = new SearchResult();
-                    searchResult.title = title;
-                    searchResult.content = content;
-                    searchResult.point = getGeomCenter(graphic);
-                    searchResult.link = link ? link : null;
-                    searchResult.linkAlias = linkAlias;
-                    searchResult.geometry = graphic.geometry;
-                    searchResult.graphic = graphic;
+                    var resultAttributes:ResultAttributes = new ResultAttributes();
+                    resultAttributes.title = title;
+                    resultAttributes.content = content;
+                    resultAttributes.link = link ? link : null;
+                    resultAttributes.linkAlias = linkAlias;
+
+                    var searchResult:ResultItem = new ResultItem(graphic, resultAttributes);
 
                     if (graphic.geometry)
                     {
@@ -717,25 +718,25 @@
                         {
                             case Geometry.MAPPOINT:
                             {
-                                graphic.symbol = searchResult.symbol = resultMarkerSymbol;
+                                graphic.symbol = resultMarkerSymbol;
                                 break;
                             }
                             case Geometry.POLYLINE:
                             {
-                                graphic.symbol = searchResult.symbol = resultLineSymbol;
+                                graphic.symbol = resultLineSymbol;
                                 break;
                             }
                             case Geometry.POLYGON:
                             {
-                                graphic.symbol = searchResult.symbol = resultFillSymbol;
+                                graphic.symbol = resultFillSymbol;
                                 break;
                             }
                         }
                     }
 
-                    graphic.attributes = searchResult;
+                    graphic.attributes = resultAttributes;
                     result.addItem(searchResult);
-                    var isValidPoint:Boolean = searchResult.point && !isNaN(searchResult.point.x) && !isNaN(searchResult.point.y);
+                    var isValidPoint:Boolean = searchResult.center && !isNaN(searchResult.center.x) && !isNaN(searchResult.center.y);
 
                     if (isValidPoint)
                     {
@@ -762,7 +763,7 @@
                     var sfx:String = link.substr(pos, 4).toLowerCase();
                     var isImageLink:Boolean = (sfx == ".jpg") || (sfx == ".png") || (sfx == ".gif");
 
-                    if (false)
+                    if (isImageLink)
                     {
                         var popUpMediaInfo:PopUpMediaInfo = new PopUpMediaInfo;
                         popUpMediaInfo.imageLinkURL = link;
@@ -920,43 +921,6 @@
                 return result;
             }
 
-            private function getGeomCenter(graphic:Graphic):MapPoint
-            {
-                var point:MapPoint;
-                var geometry:Geometry = graphic.geometry;
-
-                if (geometry)
-                {
-                    switch (geometry.type)
-                    {
-                        case Geometry.MAPPOINT:
-                        {
-                            point = geometry as MapPoint;
-                            break;
-                        }
-                        case Geometry.POLYLINE:
-                        {
-                            const pl:Polyline = geometry as Polyline;
-                            const pathCount:Number = pl.paths.length;
-                            const pathIndex:int = int((pathCount / 2) - 1);
-                            const midPath:Array = pl.paths[pathIndex];
-                            const ptCount:Number = midPath.length;
-                            const ptIndex:int = int((ptCount / 2) - 1);
-                            point = pl.getPoint(pathIndex, ptIndex);
-                            break;
-                        }
-                        case Geometry.POLYGON:
-                        {
-                            const poly:Polygon = geometry as Polygon;
-                            point = poly.extent.center;
-                            break;
-                        }
-                    }
-                }
-
-                return point;
-            }
-
             private function clear():void
             {
                 hideInfoWindow();
@@ -974,8 +938,8 @@
             private function mouseOverSearchResult(event:Event):void
             {
                 clearTimeout(hitimer);
-                var searchResult:SearchResult = ItemRenderer(event.target).data as SearchResult;
-                var mapExtentContainsSearchResult:Boolean = map.extent.containsXY(searchResult.point.x, searchResult.point.y);
+                var searchResult:ResultItem = ItemRenderer(event.target).data as ResultItem;
+                var mapExtentContainsSearchResult:Boolean = map.extent.containsXY(searchResult.center.x, searchResult.center.y);
 
                 if (mapExtentContainsSearchResult)
                 {
@@ -994,7 +958,7 @@
 
             private function clickSearchResult(event:Event):void
             {
-                var searchResult:SearchResult = ItemRenderer(event.target).data as SearchResult;
+                var searchResult:ResultItem = ItemRenderer(event.target).data as ResultItem;
                 if (searchResult.geometry)
                 {
                     if (searchResult.geometry.type == Geometry.MAPPOINT)
@@ -1004,7 +968,7 @@
                             map.scale = zoomScale;
                         }
 
-                        map.centerAt(searchResult.point);
+                        map.centerAt(searchResult.center);
                     }
                     else
                     {
@@ -1022,11 +986,12 @@
 
             private function showHighlight(params:Array):void
             {
-                var showHighlightPoint:MapPoint = params[0].point as MapPoint;
-                var linkAlias:String = params[0].linkAlias;
+                var searchResult:ResultItem = params[0];
+                var showHighlightPoint:MapPoint = searchResult.center as MapPoint;
+                var linkAlias:String = searchResult.attributes.linkAlias;
 
-                popUpRenderer.popUpInfo = configurePopUpInfo(params[0].graphic.attributes.link, linkAlias);
-                popUpRenderer.graphic = params[0].graphic;
+                popUpRenderer.popUpInfo = configurePopUpInfo(searchResult.attributes.link, linkAlias);
+                popUpRenderer.graphic = searchResult.graphic;
 
                 map.infoWindow.content = popUpRenderer;
                 map.infoWindow.contentOwner = popUpRenderer.graphic;
diff --git a/src/widgets/Search/SearchWidget_Louisville.xml b/src/widgets/Search/SearchWidget_Louisville.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Splash/SplashWidget.mxml b/src/widgets/Splash/SplashWidget.mxml
old mode 100644
new mode 100755
index 5c7bdf6..6c9b259
--- a/src/widgets/Splash/SplashWidget.mxml
+++ b/src/widgets/Splash/SplashWidget.mxml
@@ -35,7 +35,7 @@
                 if (configXML)
                 {
                     content = configXML.content || "...";
-                    btnLabel = configXML.btnlabel || getDefaultString("okLabel");
+                    btnLabel = configXML.labels.btnlabel[0] || configXML.btnlabel || getDefaultString("okLabel");
                     txtareaWidth = configXML.width || 500;
                     txtareaHeight = configXML.height || 500;
 
diff --git a/src/widgets/Splash/SplashWidget.xml b/src/widgets/Splash/SplashWidget.xml
old mode 100644
new mode 100755
index 760d755..60ba87f
--- a/src/widgets/Splash/SplashWidget.xml
+++ b/src/widgets/Splash/SplashWidget.xml
@@ -21,7 +21,7 @@
         </p>
         <textformat blockindent="20">
             <p>
-                * Built with <a href="http://help.arcgis.com/en/webapps/flexviewer/" target='_blank'><font color="#FFFFFF"><b>ArcGIS Viewer for Flex</b></font></a>
+                * Built with <a href="http://resourcesbeta.arcgis.com/en/communities/flex-viewer/" target='_blank'><font color="#FFFFFF"><b>ArcGIS Viewer for Flex</b></font></a>
                 <br>
                 * Based on <a href="http://help.arcgis.com/en/webapi/flex/" target='_blank'><font color="#FFFFFF"><b>ArcGIS API for Flex</b></font></a>
             </p>
diff --git a/src/widgets/StaticImage/StaticImageWidget.mxml b/src/widgets/StaticImage/StaticImageWidget.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/StaticImage/StaticImageWidget.xml b/src/widgets/StaticImage/StaticImageWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Time/TimeWidget.mxml b/src/widgets/Time/TimeWidget.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/Time/TimeWidget.xml b/src/widgets/Time/TimeWidget.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/Time/TimeWidget_QuakesSince1970.xml b/src/widgets/Time/TimeWidget_QuakesSince1970.xml
old mode 100644
new mode 100755
diff --git a/src/widgets/WidgetContainer/WidgetContainer.mxml b/src/widgets/WidgetContainer/WidgetContainer.mxml
old mode 100644
new mode 100755
index fc7a286..3b36be8
--- a/src/widgets/WidgetContainer/WidgetContainer.mxml
+++ b/src/widgets/WidgetContainer/WidgetContainer.mxml
@@ -40,6 +40,19 @@
             import spark.layouts.TileLayout;
             import spark.layouts.VerticalLayout;
 
+            private const PADDING:int = 28;
+
+            private const UP:String = "up";
+            private const DOWN:String = "down";
+            private const LEFT:String = "left";
+            private const RIGHT:String = "right";
+
+            private const HORIZONTAL:String = "horizontal";
+            private const VERTICAL:String = "vertical";
+            private const TILE:String = "tile";
+            private const FIX:String = "fix";
+            private const FLOAT:String = "float";
+
             private var isDraggable:Boolean = true;
             private var isResizeable:Boolean = true;
 
@@ -211,7 +224,7 @@
                     if (baseWidget.widgetId == id)
                     {
 
-                        if ((widgetlayout == "horizontal") || (widgetlayout == "vertical"))
+                        if ((widgetlayout == HORIZONTAL) || (widgetlayout == VERTICAL))
                         {
                             if (!_transitionInProgress)
                             {
@@ -275,19 +288,19 @@
                     return;
                 }
 
-                if (dir == "U")
+                if (dir == UP)
                 {
-                    widgetContainer.verticalScrollPosition -= 10;
+                    widgetContainer.verticalScrollPosition += 10;
                 }
-                else if (dir == "D")
+                else if (dir == DOWN)
                 {
-                    widgetContainer.verticalScrollPosition += 10;
+                    widgetContainer.verticalScrollPosition -= 10;
                 }
-                else if (dir == "L")
+                else if (dir == LEFT)
                 {
                     widgetContainer.horizontalScrollPosition += 10;
                 }
-                else if (dir == "R")
+                else if (dir == RIGHT)
                 {
                     widgetContainer.horizontalScrollPosition -= 10;
                 }
@@ -300,21 +313,27 @@
                 var screenW:Number = boxRect.width;
                 var screenH:Number = boxRect.height;
 
-                if (dir == "U")
+                var lastVisibleWidget:IVisualElement;
+
+                if (dir == UP)
                 {
-                    return widgetContainer.verticalScrollPosition > 0 - screenH;
+                    lastVisibleWidget = widgetContainer.getElementAt(widgetContainer.numElements - 1);
+                    return widgetContainer.verticalScrollPosition < widgetContainer.contentHeight - lastVisibleWidget.height - PADDING;
                 }
-                else if (dir == "D")
+                else if (dir == DOWN)
                 {
-                    return widgetContainer.verticalScrollPosition < widgetContainer.contentHeight;
+                    lastVisibleWidget = widgetContainer.getElementAt(0);
+                    return widgetContainer.verticalScrollPosition > 0 - screenH + lastVisibleWidget.height + PADDING;
                 }
-                else if (dir == "L")
+                else if (dir == LEFT)
                 {
-                    return widgetContainer.horizontalScrollPosition < widgetContainer.contentWidth;
+                    lastVisibleWidget = widgetContainer.getElementAt(widgetContainer.numElements - 1);
+                    return widgetContainer.horizontalScrollPosition < widgetContainer.contentWidth - lastVisibleWidget.width - PADDING;
                 }
-                else if (dir == "R")
+                else if (dir == RIGHT)
                 {
-                    return widgetContainer.horizontalScrollPosition > 0 - screenW;
+                    lastVisibleWidget = widgetContainer.getElementAt(0);
+                    return widgetContainer.horizontalScrollPosition > 0 - screenW + lastVisibleWidget.width + PADDING;
                 }
 
                 return false;
@@ -371,22 +390,22 @@
                     if (topDelta > 0)
                     {
                         scrolldist = topDelta;
-                        scrolldir = "U";
+                        scrolldir = UP;
                     }
                     else if (bottomDelta > 0)
                     {
                         scrolldist = bottomDelta;
-                        scrolldir = "D";
+                        scrolldir = DOWN;
                     }
                     else if (leftDelta > 0)
                     {
                         scrolldist = leftDelta;
-                        scrolldir = "R";
+                        scrolldir = RIGHT;
                     }
                     else if (rightDelta > 0)
                     {
                         scrolldist = rightDelta;
-                        scrolldir = "L";
+                        scrolldir = LEFT;
                     }
                     scrollinterval = setInterval(scrollToWidgetAction, 30, params);
                     dist = 0;
@@ -397,19 +416,19 @@
             {
                 if (dist < scrolldist)
                 {
-                    if (scrolldir == "U")
+                    if (scrolldir == UP)
                     {
                         widgetContainer.verticalScrollPosition -= 10;
                     }
-                    else if (scrolldir == "D")
+                    else if (scrolldir == DOWN)
                     {
                         widgetContainer.verticalScrollPosition += 10;
                     }
-                    else if (scrolldir == "L")
+                    else if (scrolldir == LEFT)
                     {
                         widgetContainer.horizontalScrollPosition += 10;
                     }
-                    else if (scrolldir == "R")
+                    else if (scrolldir == RIGHT)
                     {
                         widgetContainer.horizontalScrollPosition -= 10;
                     }
@@ -431,7 +450,7 @@
 
             private function isConstrainedLayout():Boolean
             {
-                return widgetlayout == "horizontal" || widgetlayout == "vertical" || widgetlayout == "tile" || widgetlayout == "fix";
+                return widgetlayout == HORIZONTAL || widgetlayout == VERTICAL || widgetlayout == TILE || widgetlayout == FIX;
             }
 
             public function get widgetlayout():String
@@ -447,7 +466,7 @@
 
                     switch (layout)
                     {
-                        case "horizontal":
+                        case HORIZONTAL:
                         {
                             var hLayout:HorizontalLayout = new HorizontalLayout;
                             hLayout.verticalAlign = "bottom";
@@ -459,7 +478,7 @@
                             isResizeable = false;
                             break;
                         }
-                        case "vertical":
+                        case VERTICAL:
                         {
                             var vLayout:VerticalLayout = new VerticalLayout;
                             vLayout.horizontalAlign = "right";
@@ -472,7 +491,7 @@
                             isResizeable = false;
                             break;
                         }
-                        case "tile":
+                        case TILE:
                         {
                             var tLayout:TileLayout = new TileLayout;
                             widgetContainer.layout = tLayout;
@@ -481,14 +500,14 @@
                             isDraggable = false;
                             break;
                         }
-                        case "fix":
+                        case FIX:
                         {
                             widgetContainer.layout = new BasicLayout;
                             isResizeable = false;
                             isDraggable = false;
                             break;
                         }
-                        case "float":
+                        case FLOAT:
                         {
                             widgetContainer.layout = new BasicLayout();
                             widgetContainer.clipAndEnableScrolling = false;
@@ -522,13 +541,13 @@
             {
                 switch (layout)
                 {
-                    case "horizontal":
+                    case HORIZONTAL:
                     {
                         _hv = true;
                         _vv = false;
                         break;
                     }
-                    case "vertical":
+                    case VERTICAL:
                     {
                         _hv = false;
                         _vv = true;
@@ -577,7 +596,7 @@
             {
                 AppEvent.dispatch(AppEvent.TOC_HIDDEN); // always hide the toc layer menu
 
-                if (state == "V")
+                if (state == VERTICAL)
                 {
                     containerWidth = widgetContainer.width;
                     if (currentState != "collapsedRight")
@@ -590,7 +609,7 @@
                         currentState = "normal";
                     }
                 }
-                else if (state == "H")
+                else if (state == HORIZONTAL)
                 {
                     containerHeight = widgetContainer.height;
                     if (currentState != "collapsedDown")
@@ -707,7 +726,7 @@
         <mx:Image id="btnVCollapse"
                   alpha="0.9"
                   buttonMode="true"
-                  click="toggleState('V')"
+                  click="toggleState(VERTICAL)"
                   source="assets/images/w_collapse.png"
                   transformX="10"
                   transformY="10"
@@ -716,7 +735,7 @@
         <mx:Image id="btnUp"
                   alpha="0.9"
                   buttonMode="true"
-                  mouseDown="startScroll('D')"
+                  mouseDown="startScroll(UP)"
                   source="assets/images/w_up.png"
                   useHandCursor="true"
                   visible="{_vv}"
@@ -724,7 +743,7 @@
         <mx:Image id="btnDown"
                   alpha="0.9"
                   buttonMode="true"
-                  mouseDown="startScroll('U')"
+                  mouseDown="startScroll(DOWN)"
                   source="assets/images/w_down.png"
                   useHandCursor="true"
                   visible="{_vv}"
@@ -753,7 +772,7 @@
         <mx:Image id="btnHCollapse"
                   alpha="0.9"
                   buttonMode="true"
-                  click="toggleState('H')"
+                  click="toggleState(HORIZONTAL)"
                   source="assets/images/w_collapse_down.png"
                   transformX="10"
                   transformY="10"
@@ -762,7 +781,7 @@
         <mx:Image id="btnLeft"
                   alpha="0.9"
                   buttonMode="true"
-                  mouseDown="startScroll('L')"
+                  mouseDown="startScroll(LEFT)"
                   source="assets/images/w_left.png"
                   useHandCursor="true"
                   visible="{_hv}"
@@ -770,7 +789,7 @@
         <mx:Image id="btnRight"
                   alpha="0.9"
                   buttonMode="true"
-                  mouseDown="startScroll('R')"
+                  mouseDown="startScroll(RIGHT)"
                   source="assets/images/w_right.png"
                   useHandCursor="true"
                   visible="{_hv}"
diff --git a/src/widgets/WidgetContainer/WidgetContainerWidget.mxml b/src/widgets/WidgetContainer/WidgetContainerWidget.mxml
old mode 100644
new mode 100755
diff --git a/src/widgets/supportClasses/ResultAttributes.as b/src/widgets/supportClasses/ResultAttributes.as
new file mode 100755
index 0000000..2e1c0e6
--- /dev/null
+++ b/src/widgets/supportClasses/ResultAttributes.as
@@ -0,0 +1,12 @@
+package widgets.supportClasses
+{
+
+[Bindable]
+public class ResultAttributes
+{
+    public var title:String;
+    public var content:String;
+    public var link:String;
+    public var linkAlias:String;
+}
+}
diff --git a/src/widgets/supportClasses/ResultItem.as b/src/widgets/supportClasses/ResultItem.as
new file mode 100755
index 0000000..62dc728
--- /dev/null
+++ b/src/widgets/supportClasses/ResultItem.as
@@ -0,0 +1,111 @@
+///////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2010-2011 Esri. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+///////////////////////////////////////////////////////////////////////////
+package widgets.supportClasses
+{
+
+import com.esri.ags.Graphic;
+import com.esri.ags.geometry.Geometry;
+import com.esri.ags.geometry.MapPoint;
+import com.esri.ags.geometry.Multipoint;
+import com.esri.ags.geometry.Polygon;
+import com.esri.ags.geometry.Polyline;
+import com.esri.ags.symbols.Symbol;
+
+[Bindable]
+public class ResultItem
+{
+    public function ResultItem(graphic:Graphic, attributes:ResultAttributes)
+    {
+        _graphic = graphic;
+        _attributes = attributes;
+        _center = getGeomCenter(graphic);
+    }
+    private var _graphic:Graphic;
+
+    public function get graphic():Graphic
+    {
+        return _graphic;
+    }
+
+    private var _attributes:ResultAttributes;
+
+    public function get attributes():ResultAttributes
+    {
+        return _attributes;
+    }
+
+    private var _center:MapPoint;
+
+    public function get center():MapPoint
+    {
+        return _center;
+    }
+
+    public function get geometry():Geometry
+    {
+        return _graphic.geometry;
+    }
+
+    public function get symbol():Symbol
+    {
+        return _graphic.symbol;
+    }
+
+    private function getGeomCenter(graphic:Graphic):MapPoint
+    {
+        var point:MapPoint;
+        var geometry:Geometry = graphic.geometry;
+
+        if (geometry)
+        {
+            switch (geometry.type)
+            {
+                case Geometry.MAPPOINT:
+                {
+                    point = geometry as MapPoint;
+                    break;
+                }
+                case Geometry.MULTIPOINT:
+                {
+                    const multipoint:Multipoint = geometry as Multipoint;
+                    point = multipoint.points && multipoint.points.length > 0 ? multipoint.points[0] as MapPoint : null;
+                    break;
+                }
+                case Geometry.POLYLINE:
+                {
+                    var pl:Polyline = geometry as Polyline;
+                    var pathCount:Number = pl.paths.length;
+                    var pathIndex:int = int((pathCount / 2) - 1);
+                    var midPath:Array = pl.paths[pathIndex];
+                    var ptCount:Number = midPath.length;
+                    var ptIndex:int = int((ptCount / 2) - 1);
+                    point = pl.getPoint(pathIndex, ptIndex);
+                    break;
+                }
+                case Geometry.POLYGON:
+                {
+                    const poly:Polygon = geometry as Polygon;
+                    point = poly.extent.center;
+                    break;
+                }
+            }
+        }
+
+        return point;
+    }
+}
+
+}