Merge branch 'feature/multi-php' into develop
integrate Application Cache awareness into boot sequence
move Google Maps BICv2 out of main.js for easier maintenance / reuse
Merge remote-tracking branch 'origin/develop' into develop
better JSLint compliance in main.js (still loads to fix)
Merge branch 'feature/Vagrant' into develop
better JSLint compliance, fix a bug with error reporting
tweak to new applicationCache logic to fix support for offline=false
BlinkStorage: ensure db.readTransaction is available
Merge branch 'develop' of git:bmp into develop
message interactions get fixHTML,
xslt interactions, get fix image path operations
change geolocation options to timeout:10s and maxAge:10m
Removed Livezones

Updated Scrape Test: removed livezone functions

updated healthCheck to not worry about livezone tables
deleteWholeanswerspace to not worry about livezone data
bf2main > to not created livezone related tables

removed livezone elements from answerspace maintainance

updated stylesheets that carried livezone css classes

removed livezone references from answerspace.php + delete.php
removed showPieChart reference which also invalidly used

removed livezone functions from scrape

removed livezone references from answerspace export

removed references to livezones

updated scss files, removed livezone css classes
updated references to livezones
livezone folder is deleted
Merge branch 'develop' of git.blinkmobile.lan:bmp into develop
Merge remote-tracking branch 'origin/develop' into develop
update NPM packages; fix JSLint-compliance
Merge branch 'develop' of git.blinkmobile.lan:bmp into develop
Merge remote-tracking branch 'origin/develop' into develop
Removed SavedSession and Device tables
deleted all the references/files related to savedSession
updated bf2_main.sql
Merge branch 'release/2013W31' into develop

Conflicts:
	.gitignore
	Gruntfile.js
	README.md
	ansible
	composer.json
	includes/Blink/JavaScriptEnv.php
	includes/Blink/cdn/PlatformCDN.php
	includes/Blink/cdn/cdn_factory.php
	includes/Blink/evaluator/evaluateCode.php
	includes/Blink/evaluator/runCode.php
	includes/Blink/evaluator/sandbox.class.php
	includes/Blink/evaluator/scrape/scrape_operations.php
	includes/Blink/evaluator/scrape/scrape_privileged.php
	includes/Blink/evaluator/scrape/scrape_super.php
	includes/Blink/export/export_csv.php
	includes/Blink/export/export_diff.php
	includes/Blink/export/export_driver.php
	includes/Blink/export/export_factory.php
	includes/Blink/export_import.lib.php
	includes/Blink/import/import_csv.php
	includes/Blink/import/import_diff.php
	includes/Blink/import/import_driver.php
	includes/Blink/import/import_factory.php
	includes/BlinkCURL.php
	includes/BlinkPlatformConfig.php
	includes/BlinkSession.php
	includes/ScrapeClassLoader.php
	includes/admin/ListingRenderer.php
	includes/admin/Tag.php
	includes/admin/Tagger.php
	includes/answers_config.inc.php.default
	includes/autoload_withSession.php
	includes/cfg.inc.apache
	includes/deviceConfig/DeviceIdentifier.php
	includes/deviceConfig/OverridesRenderer.php
	includes/deviceConfig/ParentRenderer.php
	includes/deviceConfig/SettingsParser.php
	includes/deviceConfig/SettingsRenderer.php
	includes/deviceConfig/answerSpace.xml
	includes/deviceConfig/answerSpaceMap.php
	includes/kohana/bootstrap.php
	includes/kohana/classes/controller/answerspaces.php
	includes/kohana/classes/model/administrator.php
	includes/kohana/config/auth.php
	includes/kohana/config/session.php
	includes/kohana/models/proxies/__CG__modelsOrganisation.php
	includes/kohana/views/answerspaces/delete.php
	includes/leenara/applib/blink_forms/blinkform.lib.php
	includes/leenara/applib/blink_forms/form_connection.php
	includes/leenara/applib/blink_forms/form_database.php
	includes/leenara/applib/blink_forms/form_field.lib.php
	includes/leenara/applib/blink_forms/form_object.lib.php
	includes/leenara/templates/bf_formobject4_configform.tpl.php
	includes/leenara/templates/bf_formobject5_reporting.tpl.php
	includes/leenara/templates/bf_formobject_madl.tpl.php
	includes/lib/BlinkSharepointAPI.php
	includes/scrape.php
	package.json
	public_html/_BICv3_/index.php
	public_html/_R_/android/3/cache.manifest
	public_html/_R_/android/3/index.php
	public_html/_R_/common/3/BlinkForms2.js
	public_html/_R_/common/3/cache.manifest
	public_html/_R_/common/3/common.css
	public_html/_R_/common/3/index_1_config.php
	public_html/_R_/common/3/index_2_stacklayout.php
	public_html/_R_/common/3/index_3_bodyscripts.php
	public_html/_R_/common/3/main.js
	public_html/_R_/common/3/scss/common.scss
	public_html/_R_/common/3/signaturePad.html
	public_html/_R_/common/3/signaturePad.manifest
	public_html/_R_/common/3/sketchPad.html
	public_html/_R_/common/3/source/BlinkStorage.js
	public_html/_R_/common/3/source/Forms2GetUserMedia.js
	public_html/_R_/common/3/source/Forms2InlineSignature.js
	public_html/_R_/common/3/source/utilities.js
	public_html/_R_/common/3/util/GetCacheManifest.php
	public_html/_R_/common/3/xhr/GetAnswer.php
	public_html/_R_/common/3/xhr/GetConfig.php
	public_html/_R_/common/3/xhr/GetForm.php
	public_html/_R_/common/3/xhr/GetFormList.php
	public_html/_R_/common/3/xhr/GetFormRecord.php
	public_html/_R_/common/3/xhr/GetLogin.php
	public_html/_R_/common/3/xhr/GetMoJO.php
	public_html/_R_/common/3/xhr/SaveFormBlob.php
	public_html/_R_/common/3/xhr/SaveFormRecord.php
	public_html/_R_/common/3/xhr/common.php
	public_html/_R_/gecko/3/cache.manifest
	public_html/_R_/gecko/3/index.php
	public_html/_R_/ios/3/cache.manifest
	public_html/_R_/ios/3/index.php
	public_html/_R_/ios/3/ios.css
	public_html/_R_/msie/3/cache.manifest
	public_html/_R_/msie/3/index.php
	public_html/_W_/ios/10/Images/button.png
	public_html/_api/interaction/run.php
	public_html/active_pages/answer.css
	public_html/active_pages/answer.php
	public_html/active_pages/listing.php
	public_html/active_pages/mobi_site.php
	public_html/active_pages/scss/answer.scss
	public_html/admin/ajax/formobject.ajax.php
	public_html/admin/answer_loginfo.php
	public_html/admin/answer_loglist.php
	public_html/admin/answer_logview.php
	public_html/admin/answer_spaceedit.php
	public_html/admin/answerspace_export.php
	public_html/admin/answerspace_export_generate.php
	public_html/admin/answerspace_import.php
	public_html/admin/answerspace_import_checkrecords.php
	public_html/admin/answerspace_import_process_all.php
	public_html/admin/answerspace_maintenance.php
	public_html/admin/asset_manager.php
	public_html/admin/attributeadd.php
	public_html/admin/attributedelete.php
	public_html/admin/attributeedit.php
	public_html/admin/attributeinfo.php
	public_html/admin/attributelist.php
	public_html/admin/attributemaster.php
	public_html/admin/bf_blinkNow.php
	public_html/admin/bf_cfgconns.php
	public_html/admin/bf_formobject3_configfields.php
	public_html/admin/bf_listing_process.ajax.php
	public_html/admin/bf_regeneratedb.php
	public_html/admin/categoryedit.php
	public_html/admin/custompage.php
	public_html/admin/ewmenu.php
	public_html/admin/exception_loginfo.php
	public_html/admin/exception_loglist.php
	public_html/admin/groupadd.php
	public_html/admin/groupdelete.php
	public_html/admin/groupedit.php
	public_html/admin/groupinfo.php
	public_html/admin/grouplist.php
	public_html/admin/header.php
	public_html/admin/index.php
	public_html/admin/js/deviceConfig.js
	public_html/admin/keywordedit.php
	public_html/admin/master_categoryedit.php
	public_html/admin/phpfn8.php
	public_html/admin/phplang/english.xml
	public_html/admin/send_loginfo.php
	public_html/admin/send_loglist.php
	public_html/admin/switch_bic.php
	public_html/admin/user_attributeadd.php
	public_html/admin/user_attributedelete.php
	public_html/admin/user_attributeedit.php
	public_html/admin/user_attributeinfo.php
	public_html/admin/user_attributelist.php
	public_html/admin/user_attributepreview.php
	public_html/admin/user_groupadd.php
	public_html/admin/user_groupdelete.php
	public_html/admin/user_groupinfo.php
	public_html/admin/user_grouplist.php
	public_html/admin/user_grouppreview.php
	public_html/admin/user_update_loginfo.php
	public_html/admin/user_update_loglist.php
	public_html/admin/useradd.php
	public_html/admin/userdelete.php
	public_html/admin/useredit.php
	public_html/admin/userinfo.php
	public_html/admin/userlist.php
	public_html/admin/usermaster.php
	public_html/admin/xhr/GetComponentList.php
	public_html/admin/xhr/GetOverrides.php
	public_html/admin/xhr/GetSettings.php
	public_html/admin/xhr/SaveSettings.php
	public_html/admin/xhr/TagItems.php
	public_html/admin/xhr/UpdateParents.php
	public_html/admin/xhr/UpdateTags.php
	public_html/admin/xhr/UploadImage.php
	public_html/images/get.php
	public_html/tools/code-builder.php
	public_html/tools/mforms.php
	public_html/webroot_file.php
	scripts/cfg.domains.apache.php
	scripts/composer.phar
	scripts/cron/composer.php
	scripts/delete_whole_answerspace.php
	scripts/healthCheck.php
	scripts/sql/bf2_main.sql
	scripts/sql/latestSchema.php
	scripts/sql/v2/db.alter.forms.index.sql
	scripts/sql/v5/migration_v5.php
	tests/browser/forms2_blobs/env-body.js
	tests/browser/forms2_blobs/fixtures.js
	tests/browser/forms2_blobs/tests.js
	tests/javascript/MochaGJSLint.js
	tests/php/includes/ScrapeTest.php