Merged dev

Author: jmatsushita

AndroidManifest.xml

@@ -18,6 +18,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
 
     <application android:icon="@drawable/icon_calculator"
                  android:theme="@android:style/Theme.Light.NoTitleBar"
@@ -65,7 +66,7 @@
                   android:screenOrientation="portrait"
                   android:excludeFromRecents="true"/>
         <activity android:name=".CalculatorActivity"
-                  android:launchMode="singleInstance"
+                  android:launchMode="singleTask"
                   android:screenOrientation="portrait"
                   android:excludeFromRecents="true"/>
         <activity android:name=".LoginActivity"
@@ -100,6 +101,17 @@
             </intent-filter>
         </receiver>
 
+        
+        <!--Check Current Running Activity Receivers -->
+        <receiver android:name=".trigger.StartupReceiver">
+			<intent-filter>
+				<action android:name="android.intent.action.BOOT_COMPLETED" />
+				<action android:name="StartupReceiver_Manual_Start" />
+			</intent-filter>
+		</receiver>
+		
+        <receiver android:name = ".trigger.CheckRunningApplicationReceiver"/>
+        
     </application>
 </manifest>
 

features/1_welcome.feature

@@ -2,7 +2,7 @@
 Feature: Welcome page
 
   Scenario: Verify wizard start screen is displayed on clicking wizard entry point
-    Given I wait upto 30 seconds for the "WizardActivity" screen to appear
+    Given I wait upto 60 seconds for the "WizardActivity" screen to appear
     Then I see the text "Panic Button"
-    Then I verify action button text is "Take me to the training"
-    Then I verify action button is "enabled"
+    Then I press "Set-Up"
+    Then I see the text "Get started"