Merge branch 'master' of github.com:teddywing/LikeFeed

Conflicts:
	tiapp.xml

1 files changed, 26 insertions, 3 deletions

diff --git a/tiapp.xml b/tiapp.xml
index 6e291b1..d1ddbe3 100644
--- a/tiapp.xml
+++ b/tiapp.xml
@@ -1,15 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ti:app xmlns:ti="http://ti.appcelerator.org">
+    <property name="acs-oauth-secret-production" type="string">8H6Tg8EVGSw8jhQqAI0YRyybF93hXqKM</property>
+    <property name="acs-oauth-key-production" type="string">cxUzPq23YVDCRyl1DZvXZya9BfiVeIr0</property>
+    <property name="acs-api-key-production" type="string">MJTTR0hSGOFif1GGDfrW5Zi5ySNNQIha</property>
+    <property name="acs-oauth-secret-development" type="string">FsWT4cYUAsNNZb2B2VzPpk7uyLNDE5On</property>
+    <property name="acs-oauth-key-development" type="string">GeOoGtXcFds17TLcC195J0akS57AnPlm</property>
+    <property name="acs-api-key-development" type="string">Qsx8MiLqKzuNJLNBXGYJ7NGzIcuNJ0el</property>
     <deployment-targets>
-        <target device="mobileweb">false</target>
+        <target device="mobileweb">true</target>
         <target device="iphone">true</target>
         <target device="ipad">true</target>
-        <target device="android">false</target>
+        <target device="android">true</target>
         <target device="blackberry">false</target>
     </deployment-targets>
+<<<<<<< HEAD
     <sdk-version>1.6.2</sdk-version>
     <id>com.sphnx.Sphnx</id>
     <name>Sphnx</name>
+=======
+    <sdk-version>2.0.2.GA</sdk-version>
+    <id>com.likefeed.LikeFeed</id>
+    <name>LikeFeed</name>
+>>>>>>> 4bcaa02ba3536316e32cb106ef2fc1a77f205b8b
     <version>1.0</version>
     <publisher>ZANT</publisher>
     <url>http://</url>
@@ -25,6 +37,7 @@
     <analytics>true</analytics>
     <property name="ti.facebook.appid">258369447595838</property>
     <guid>ccd110bb-8710-4380-ad4a-94d93e18d62a</guid>
+    <property name="ti.ui.defaultunit">system</property>
     <iphone>
         <orientations device="iphone">
             <orientation>Ti.UI.PORTRAIT</orientation>
@@ -37,5 +50,15 @@
         </orientations>
     </iphone>
     <android xmlns:android="http://schemas.android.com/apk/res/android"/>
-    <modules/>
+    <mobileweb>
+        <precache/>
+        <splash>
+            <enabled>true</enabled>
+            <inline-css-images>true</inline-css-images>
+        </splash>
+        <theme>default</theme>
+    </mobileweb>
+    <modules>
+        <module platform="commonjs" version="2.0.5">ti.cloud</module>
+    </modules>
 </ti:app>