Removes foundation gem, CSS and JS files.

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/assets/javascripts/application.js
	modified:   app/assets/stylesheets/application.css
	deleted:    app/assets/stylesheets/foundation_and_overrides.scss
Temp guts JS app to prepare for static integration.

	modified:   app/assets/javascripts/backbone/app.js.coffee
	deleted:    app/assets/javascripts/backbone/apps/nav/list/list_controller.js.coffee
	deleted:    app/assets/javascripts/backbone/apps/nav/list/list_view.js.coffee
	deleted:    app/assets/javascripts/backbone/apps/nav/list/templates/nav.jst.hbs
	deleted:    app/assets/javascripts/backbone/apps/nav/list/templates/navs.jst.hbs
	deleted:    app/assets/javascripts/backbone/apps/nav/nav_app.js.coffee
	modified:   app/assets/javascripts/backbone/config/javascript.js.coffee
	modified:   app/assets/javascripts/backbone/config/marionette/application.js.coffee
	modified:   app/assets/javascripts/backbone/config/marionette/renderer.js.coffee
	deleted:    app/assets/javascripts/backbone/entities/nav.js.coffee
	deleted:    app/assets/javascripts/backbone/entities/network.js.coffee
	modified:   app/assets/javascripts/backbone/views/_base/view.js.coffee
	modified:   app/views/application/index.html.erb
Adds theme specific asset files.
Creates Marionette app for Networks entities.

	modified:   app/assets/javascripts/application.js
	modified:   app/assets/javascripts/backbone/app.js.coffee
	new file:   app/assets/javascripts/backbone/apps/networks/list/list_controller.js.coffee
	new file:   app/assets/javascripts/backbone/apps/networks/list/list_view.js.coffee
	new file:   app/assets/javascripts/backbone/apps/networks/list/templates/empty.jst.hbs
	new file:   app/assets/javascripts/backbone/apps/networks/list/templates/layout.jst.hbs
	new file:   app/assets/javascripts/backbone/apps/networks/list/templates/list.jst.hbs
	new file:   app/assets/javascripts/backbone/apps/networks/list/templates/member.jst.hbs
	new file:   app/assets/javascripts/backbone/apps/networks/networks_app.js.coffee
	new file:   app/assets/javascripts/backbone/apps/networks/templates/layout.jst.hbs
	new file:   app/assets/javascripts/backbone/config/backbone/entities.js.coffee
	modified:   app/assets/javascripts/backbone/config/marionette/application.js.coffee
	modified:   app/assets/javascripts/backbone/config/marionette/renderer.js.coffee
	new file:   app/assets/javascripts/backbone/controllers/_base.js.coffee
	new file:   app/assets/javascripts/backbone/entities/networks.js.coffee
	modified:   app/assets/javascripts/backbone/entities/user.js.coffee
	modified:   app/assets/javascripts/backbone/views/_base/itemview.js.coffee
	modified:   app/assets/javascripts/backbone/views/_base/view.js.coffee
	new file:   app/assets/javascripts/backbone/views/templates/loading_pacifier.jst.hbs
	modified:   app/views/application/index.html.erb
Fixes List view to use 'li' tagName.

	modified:   app/assets/javascripts/backbone/apps/networks/list/list_controller.js.coffee
	modified:   app/assets/javascripts/backbone/apps/networks/list/list_view.js.coffee
Basic Netowrks Show View.

 On branch marionette_integration
	modified:   app/assets/javascripts/backbone/apps/networks/list/list_controller.js.coffee
	modified:   app/assets/javascripts/backbone/apps/networks/list/templates/member.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/networks/networks_app.js.coffee
	new file:   app/assets/javascripts/backbone/apps/networks/show/show_controller.js.coffee
	new file:   app/assets/javascripts/backbone/apps/networks/show/show_view.js.coffee
	new file:   app/assets/javascripts/backbone/apps/networks/show/templates/layout.jst.hbs
	new file:   app/assets/javascripts/backbone/apps/networks/show/templates/show.jst.hbs
	modified:   app/assets/javascripts/backbone/config/marionette/application.js.coffee
	modified:   app/assets/javascripts/backbone/entities/networks.js.coffee
	modified:   app/assets/javascripts/backbone/views/_base/view.js.coffee
Basic hookup for properties list.

	modified:   app/assets/javascripts/backbone/apps/networks/list/list_view.js.coffee
	modified:   app/assets/javascripts/backbone/apps/networks/networks_app.js.coffee
	modified:   app/assets/javascripts/backbone/apps/networks/show/show_controller.js.coffee
	modified:   app/assets/javascripts/backbone/apps/networks/show/show_view.js.coffee
	modified:   app/assets/javascripts/backbone/apps/networks/show/templates/layout.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/networks/show/templates/show.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/properties/list/list_controller.js.coffee
	modified:   app/assets/javascripts/backbone/apps/properties/list/list_view.js.coffee
	new file:   app/assets/javascripts/backbone/apps/properties/list/templates/empty.jst.hbs
	new file:   app/assets/javascripts/backbone/apps/properties/list/templates/layout.jst.hbs
	new file:   app/assets/javascripts/backbone/apps/properties/list/templates/list.jst.hbs
	deleted:    app/assets/javascripts/backbone/apps/properties/list/templates/list_layout.jst.hbs
	new file:   app/assets/javascripts/backbone/apps/properties/list/templates/member.jst.hbs
	deleted:    app/assets/javascripts/backbone/apps/properties/list/templates/no_properties.jst.hbs
	deleted:    app/assets/javascripts/backbone/apps/properties/list/templates/panel.jst.hbs
	deleted:    app/assets/javascripts/backbone/apps/properties/list/templates/properties.jst.hbs
	deleted:    app/assets/javascripts/backbone/apps/properties/list/templates/property.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/properties/properties_app.js.coffee
Showing property list with Marionette.

	modified:   app/assets/javascripts/backbone/app.js.coffee
	modified:   app/assets/javascripts/backbone/apps/networks/show/show_controller.js.coffee
	modified:   app/assets/javascripts/backbone/apps/properties/list/list_controller.js.coffee
	deleted:    app/assets/javascripts/backbone/config/backbone/entities.js.coffee
	modified:   app/assets/javascripts/backbone/config/marionette/application.js.coffee
	modified:   app/assets/javascripts/backbone/controllers/_base.js.coffee
	new file:   app/assets/javascripts/backbone/entities/_base/entities.js.coffee
	modified:   app/assets/javascripts/backbone/entities/networks.js.coffee
	modified:   app/assets/javascripts/backbone/entities/property.js.coffee
Link directly to Networks#Show view.

 On branch marionette_integration
	modified:   app/assets/javascripts/backbone/apps/networks/list/templates/member.jst.hbs
Merge branch 'master' into marionette_integration
Start of Property Application Layout.

 On branch marionette_integration
	modified:   app/assets/javascripts/backbone/app.js.coffee
	new file:   app/assets/javascripts/backbone/apps/header/header_app.js.coffee
	new file:   app/assets/javascripts/backbone/apps/header/show/show_controller.js.coffee
	new file:   app/assets/javascripts/backbone/apps/header/show/show_view.js.coffee
	new file:   app/assets/javascripts/backbone/apps/header/show/templates/show.jst.hbs
	new file:   app/assets/javascripts/backbone/apps/left_sidebar/left_sidebar_app.js.coffee
	new file:   app/assets/javascripts/backbone/apps/left_sidebar/show/show_controller.js.coffee
	new file:   app/assets/javascripts/backbone/apps/left_sidebar/show/show_view.js.coffee
	new file:   app/assets/javascripts/backbone/apps/left_sidebar/show/templates/layout.jst.hbs
	new file:   app/assets/javascripts/backbone/apps/left_sidebar/show/templates/show_nav.jst.hbs
	new file:   app/assets/javascripts/backbone/apps/left_sidebar/show/templates/show_network.jst.hbs
	new file:   app/assets/javascripts/backbone/apps/left_sidebar/show/templates/show_property.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/networks/list/templates/member.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/networks/networks_app.js.coffee
	modified:   app/assets/javascripts/backbone/apps/networks/show/show_controller.js.coffee
	new file:   app/assets/javascripts/backbone/apps/properties/layout/layout_controller.js.coffee
	new file:   app/assets/javascripts/backbone/apps/properties/layout/layout_view.js.coffee
	new file:   app/assets/javascripts/backbone/apps/properties/layout/templates/layout.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/properties/list/list_controller.js.coffee
	modified:   app/assets/javascripts/backbone/apps/properties/list/templates/member.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/properties/properties_app.js.coffee
	modified:   app/assets/javascripts/backbone/config/marionette/application.js.coffee
	modified:   app/assets/javascripts/backbone/entities/_base/entities.js.coffee
	modified:   app/assets/javascripts/backbone/entities/networks.js.coffee
	modified:   app/assets/javascripts/backbone/entities/property.js.coffee
	modified:   app/assets/javascripts/backbone/views/_base/view.js.coffee
Installs Bootstrap CSS

	modified:   app/assets/stylesheets/application.css
	new file:   app/assets/stylesheets/bootstrap/bootstrap-theme.css
	new file:   app/assets/stylesheets/bootstrap/bootstrap.css
More Bootstrap, theme, and Sass installation.

 On branch marionette_integration
	modified:   app/assets/javascripts/backbone/apps/networks/list/list_view.js.coffee
	modified:   app/assets/javascripts/backbone/apps/networks/list/templates/list.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/networks/list/templates/member.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/networks/templates/layout.jst.hbs
	modified:   app/assets/stylesheets/application.css
	new file:   app/assets/stylesheets/bootstrap/bootstrap-theme.css.map
	new file:   app/assets/stylesheets/bootstrap/bootstrap.css.map
	new file:   app/assets/stylesheets/components/network_list_item.css.scss
	new file:   app/assets/stylesheets/kalamari_dashboard.css.scss
Layout and styles for Networks Properties list.

 On branch marionette_integration
	modified:   app/assets/javascripts/backbone/apps/networks/list/templates/layout.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/networks/show/templates/layout.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/networks/show/templates/show.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/networks/templates/layout.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/properties/list/list_view.js.coffee
	modified:   app/assets/javascripts/backbone/apps/properties/list/templates/member.jst.hbs
	new file:   app/assets/stylesheets/components/network.css.scss
	new file:   app/assets/stylesheets/components/property_list_item.css.scss
	modified:   app/assets/stylesheets/kalamari_dashboard.css.scss
	modified:   app/assets/stylesheets/webarch_admin_dashboard/variables.scss
Start of Property view layout and styles.

	new file:   app/assets/images/icons/status.png
	new file:   app/assets/images/icons/status2x.png
	new file:   app/assets/images/icons/top-tray-b.png
	new file:   app/assets/images/icons/top-tray-bx2.png
	new file:   app/assets/images/icons/top-tray.png
	new file:   app/assets/images/icons/top-trayx2.png
	modified:   app/assets/javascripts/backbone/apps/header/show/show_view.js.coffee
	modified:   app/assets/javascripts/backbone/apps/header/show/templates/show.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/properties/layout/layout_view.js.coffee
	modified:   app/assets/javascripts/backbone/apps/properties/layout/templates/layout.jst.hbs
	new file:   app/assets/stylesheets/components/navbar.css.scss
	modified:   app/assets/stylesheets/webarch_admin_dashboard/modules/misc.scss
	modified:   app/assets/stylesheets/webarch_admin_dashboard/responsive.scss
Merge branch 'master' into marionette_integration
Layout and styling for left sidebar navigation.

 On branch marionette_integration
	modified:   app/assets/javascripts/backbone/apps/left_sidebar/show/show_view.js.coffee
	modified:   app/assets/javascripts/backbone/apps/left_sidebar/show/templates/layout.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/left_sidebar/show/templates/show_nav.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/left_sidebar/show/templates/show_network.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/left_sidebar/show/templates/show_property.jst.hbs
	modified:   app/assets/stylesheets/application.css
	new file:   app/assets/stylesheets/components/page_sidebar_header.css.scss
	new file:   app/assets/stylesheets/custom_icon_set/custom-set.dev.svg
	new file:   app/assets/stylesheets/custom_icon_set/custom-set.eot
	new file:   app/assets/stylesheets/custom_icon_set/custom-set.svg
	new file:   app/assets/stylesheets/custom_icon_set/custom-set.ttf
	new file:   app/assets/stylesheets/custom_icon_set/custom-set.woff
	renamed:    app/assets/stylesheets/custom_icon_set.css -> app/assets/stylesheets/custom_icon_set/custom_icon_set.css
	modified:   app/assets/stylesheets/kalamari_dashboard.css.scss
	new file:   app/assets/stylesheets/shared.css.scss
	modified:   app/assets/stylesheets/webarch_admin_dashboard/modules/layout.scss
Check Marionette view event proxy.

	modified:   app/assets/javascripts/backbone/apps/header/show/show_controller.js.coffee
	modified:   app/assets/javascripts/backbone/apps/header/show/show_view.js.coffee
Toggle left sidebar menu.

	modified:   app/assets/javascripts/backbone/apps/header/show/show_controller.js.coffee
	modified:   app/assets/javascripts/backbone/apps/properties/layout/layout_controller.js.coffee
	modified:   app/assets/javascripts/backbone/apps/properties/layout/layout_view.js.coffee
	modified:   app/assets/stylesheets/shared.css.scss
Start of Property Page Header

 On branch marionette_integration
	modified:   app/assets/javascripts/backbone/apps/left_sidebar/show/show_controller.js.coffee
	modified:   app/assets/javascripts/backbone/apps/left_sidebar/show/show_view.js.coffee
	modified:   app/assets/javascripts/backbone/apps/left_sidebar/show/templates/show_nav.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/networks/show/show_controller.js.coffee
	new file:   app/assets/javascripts/backbone/apps/properties/dashboard/dashboard_controller.js.coffee
	new file:   app/assets/javascripts/backbone/apps/properties/dashboard/dashboard_view.js.coffee
	new file:   app/assets/javascripts/backbone/apps/properties/dashboard/templates/layout.jst.hbs
	new file:   app/assets/javascripts/backbone/apps/properties/dashboard/templates/show.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/properties/layout/layout_controller.js.coffee
	modified:   app/assets/javascripts/backbone/apps/properties/layout/layout_view.js.coffee
	modified:   app/assets/javascripts/backbone/apps/properties/layout/templates/layout.jst.hbs
	modified:   app/assets/javascripts/backbone/apps/properties/properties_app.js.coffee