Merge branch 'master' of https://github.com/Esri/public-information-map-template-js

Conflicts:
	config/defaults.js

Author: driskull

config/defaults.js

@@ -34,12 +34,12 @@ define({
   "enablePrintButton": false,
   "defaultBasemap": "topo",
   "nextBasemap": "hybrid",
-  "swipeType": "vertical",
   //Go to http://www.arcgis.com/sharing/rest/content/items/df8bcc10430f48878b01c96e907a1fc3/data?f=pjson and input below the appropriate operational layer that you want to configure as swipe layer
   "swipeLayer": {
     "fields": [],
     "id": ""
   },
+  "swipeType": "vertical",
   "swipeInvertPlacement": true,
   "hideNotesLayerPopups": true,
   "enableInstagram": true,