Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

Conflicts:
	_scss/imports/scss/_Stage.scss
	js/io/system/coreioapi.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

75 files changed, 284 insertions, 331 deletions

diff --git a/.gitignore b/.gitignore
index b92bd629..fd016bd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,6 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78
 
 cloud/
 
-/.idea/scopes/scope_settings.xml
\ No newline at end of file
+/.idea/scopes/scope_settings.xml
+_scss/imports/scss/_Stage.scss
+compass_app_log.txt
\ No newline at end of file
diff --git a/_scss/compass_app_log.txt b/_scss/compass_app_log.txt
deleted file mode 100644
index 00a7f071..00000000
--- a/_scss/compass_app_log.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-2011-09-02 13:25:28 overwrite ../css/ninja.css
-2011-09-02 13:38:07 overwrite ../css/ninja.css
-2011-09-02 13:38:27 overwrite ../css/ninja.css
-2011-09-02 13:39:16 overwrite ../css/ninja.css
-2011-09-02 13:42:04 overwrite ../css/ninja.css
-2011-09-02 13:42:48 overwrite ../css/ninja.css
-2011-09-14 16:53:51 overwrite ../css/ninja.css
-2011-09-14 16:54:56 overwrite ../css/ninja.css
-2011-09-14 16:55:59 overwrite ../css/ninja.css
-2011-09-14 16:57:48 overwrite ../css/ninja.css
-2011-09-14 17:00:26 overwrite ../css/ninja.css
-2011-09-14 17:02:28     error ninja.scss (Line 19: Invalid CSS after ".SubselectionTool": expected "{", was "",")
-2011-09-14 17:02:28 overwrite ../css/ninja.css
-2011-09-14 17:04:10 overwrite ../css/ninja.css
-2011-09-14 17:05:49 overwrite ../css/ninja.css
-2011-09-14 17:08:00 overwrite ../css/ninja.css
-2011-09-14 17:08:36 overwrite ../css/ninja.css
-2011-09-14 17:09:27 overwrite ../css/ninja.css
-2011-09-14 17:10:02 overwrite ../css/ninja.css
-2011-09-14 17:11:37 overwrite ../css/ninja.css
-2011-09-14 17:12:37 overwrite ../css/ninja.css
-2011-09-14 17:14:35 overwrite ../css/ninja.css
-2011-09-14 17:15:36 overwrite ../css/ninja.css
-2011-09-14 17:16:33 overwrite ../css/ninja.css
-2011-09-14 17:17:11 overwrite ../css/ninja.css
-2011-09-14 17:17:19 overwrite ../css/ninja.css
-2011-09-14 17:18:27 overwrite ../css/ninja.css
-2011-09-14 17:19:06 overwrite ../css/ninja.css
-2011-09-14 17:19:22 overwrite ../css/ninja.css
-2011-09-14 17:19:43 overwrite ../css/ninja.css
-2011-09-14 17:20:16 overwrite ../css/ninja.css
-2011-09-14 17:20:39 overwrite ../css/ninja.css
-2011-09-14 17:21:09 overwrite ../css/ninja.css
-2011-09-14 17:21:51 overwrite ../css/ninja.css
-2011-09-14 17:22:33 overwrite ../css/ninja.css
-2011-09-15 13:56:59 overwrite ../css/ninja.css
-2011-09-15 13:57:29 overwrite ../css/ninja.css
-2011-10-03 13:19:40 overwrite ../css/ninja.css
-2011-10-03 13:21:00 overwrite ../css/ninja.css
-2011-10-03 13:21:21 overwrite ../css/ninja.css
-2011-10-03 13:26:42 overwrite ../css/ninja.css
-2011-10-03 13:44:20 overwrite ../css/ninja.css
-2011-10-03 13:44:54 overwrite ../css/ninja.css
-2011-10-03 13:45:14 overwrite ../css/ninja.css
-2011-10-03 13:46:26 overwrite ../css/ninja.css
-2011-10-03 13:46:29 overwrite ../css/ninja.css
-2011-10-04 15:06:33 overwrite ../css/ninja.css
-2011-10-04 15:06:36 overwrite ../css/ninja.css
-2011-10-04 15:06:43 overwrite ../css/ninja.css
-2011-10-04 15:15:22 overwrite ../css/ninja.css
-2011-10-11 16:02:52 overwrite ../css/ninja.css
-2011-10-13 00:13:38 identical ../css/ninja.css
-2011-10-13 00:14:12 overwrite ../css/ninja.css
-2011-10-13 00:15:03 overwrite ../css/ninja.css
-2011-10-26 15:19:00 overwrite ../css/ninja.css
-2011-10-26 15:19:33 overwrite ../css/ninja.css
-2011-11-22 16:21:56 overwrite ../css/ninja.css
-2011-11-22 17:47:41 overwrite ../css/ninja.css
-2011-11-30 01:14:42 overwrite ../css/ninja.css
-2011-11-30 01:15:04 overwrite ../css/ninja.css
-2011-11-30 01:15:09 overwrite ../css/ninja.css
-2011-11-30 16:54:38 overwrite ../css/ninja.css
-2011-12-01 11:38:06 overwrite ../css/ninja.css
-2011-12-01 11:38:11 overwrite ../css/ninja.css
-2011-12-07 12:10:05 overwrite ../css/ninja.css
-2011-12-07 12:10:22 overwrite ../css/ninja.css
-2011-12-07 12:12:11 overwrite ../css/ninja.css
-2011-12-07 12:14:43 overwrite ../css/ninja.css
-2011-12-07 17:32:10 overwrite ../css/ninja.css
-2011-12-07 17:55:01 overwrite ../css/ninja.css
-2011-12-15 14:51:46 overwrite ../css/ninja.css
-2011-12-15 14:52:46 overwrite ../css/ninja.css
-2011-12-15 14:52:59 overwrite ../css/ninja.css
-2011-12-15 14:53:25 overwrite ../css/ninja.css
-2011-12-20 21:56:57 overwrite ../css/ninja.css
-2011-12-30 15:41:28 overwrite ../css/ninja.css
-2011-12-30 15:43:24 overwrite ../css/ninja.css
-2011-12-30 15:45:49 overwrite ../css/ninja.css
-2012-01-12 16:26:20 overwrite ../css/ninja.css
-2012-01-12 16:26:22 overwrite ../css/ninja.css
-2012-01-12 16:26:25 overwrite ../css/ninja.css
-2012-01-19 11:06:48 overwrite ../css/ninja.css
-2012-01-19 11:06:55 overwrite ../css/ninja.css
-2012-01-19 11:11:16 overwrite ../css/ninja.css
-2012-01-19 14:30:22 overwrite ../css/ninja.css
-2012-01-19 14:35:47 overwrite ../css/ninja.css
-2012-01-19 14:38:18 overwrite ../css/ninja.css
-2012-01-19 14:40:59 overwrite ../css/ninja.css
-2012-01-19 14:41:24 overwrite ../css/ninja.css
-2012-01-20 15:13:41 overwrite ../css/ninja.css
-2012-01-20 15:14:27 overwrite ../css/ninja.css
-2012-01-20 15:15:32 overwrite ../css/ninja.css
-2012-01-20 15:16:38 overwrite ../css/ninja.css
-2012-01-20 15:17:03 overwrite ../css/ninja.css
-2012-01-20 15:17:39 overwrite ../css/ninja.css
-2012-01-27 16:08:54     error ninja.scss (Line 26: Invalid CSS after "resize:": expected pseudoclass or pseudoelement, was "/* Base colors ...")
-2012-01-27 16:08:54 overwrite ../css/ninja.css
-2012-01-27 16:09:18     error ninja.scss (Line 26: Invalid CSS after "resize:": expected pseudoclass or pseudoelement, was "/* Base colors ...")
-2012-01-27 16:09:18 overwrite ../css/ninja.css
-2012-01-27 16:09:34     error ninja.scss (Line 93: Invalid CSS after "    z-index:": expected pseudoclass or pseudoelement, was " 2;")
-2012-01-27 16:09:34 overwrite ../css/ninja.css
-2012-01-27 16:11:17     error ninja.scss (Line 20: Invalid CSS after "...nately it doesn": expected "{", was "'t seem to work...")
-2012-01-27 16:11:17 overwrite ../css/ninja.css
-2012-01-27 16:11:57     error ninja.scss (Line 106: Invalid CSS after "...how the corner.": expected class name, was "Setting the ::-...")
-2012-01-27 16:11:57 overwrite ../css/ninja.css
-2012-01-27 16:12:29 overwrite ../css/ninja.css
-2012-01-27 16:13:46 overwrite ../css/ninja.css
-2012-01-27 16:14:02 overwrite ../css/ninja.css
diff --git a/_scss/imports/scss/_Stage.scss b/_scss/imports/scss/_Stage.scss
deleted file mode 100755
index faf8ee94..00000000
--- a/_scss/imports/scss/_Stage.scss
+++ /dev/null
@@ -1,155 +0,0 @@
-// <copyright>
-// This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-// No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-// (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-// </copyright>
-
-#middleDocArea {
-    -webkit-box-orient: horizontal;
-    -moz-box-orient: horizontal;
-    box-orient: horizontal;
-
-    -moz-box-flex: 1;
-    -webkit-box-flex: 1;
-    box-flex: 1;
-
-    margin: 1px;
-    margin-bottom:3px;
-
-    border-style: solid;
-    border-width: 1px;
-}