Merge pull request #16 from snakewaypasser/develop

Update dpops vote time with utc time and switch xcash-core to master

Author: zachhildreth

app/src/main/java/com/xcash/wallet/DpopsActivity.java

@@ -57,9 +57,10 @@
  import java.util.ArrayList;
  import java.util.Calendar;
  import java.util.List;
+ import java.util.TimeZone;
 
 
-public class DpopsActivity extends NewBaseActivity {
+ public class DpopsActivity extends NewBaseActivity {
 
     private Wallet wallet;
     private int view_normal_margin_default;
@@ -386,6 +387,7 @@ private void checkVote(View view) {
         }
 
         Calendar calendar = Calendar.getInstance();
+        calendar.setTimeZone(TimeZone.getTimeZone("UTC"));
         int minute=calendar.get(Calendar.MINUTE);
         int second=calendar.get(Calendar.SECOND);
         int waitMinute=0;

xcash-libs/script/monero-fetch.sh

@@ -11,11 +11,11 @@ url="https://github.com/X-CASH-official/xcash-core.git"
 if [ ! -d "xcash-core" ]; then
   git clone ${url}
   cd xcash-core
-  git checkout xcash_proof_of_stake
+  git checkout master
   git submodule update --recursive --init
 else
   cd xcash-core
-  git checkout xcash_proof_of_stake
+  git checkout master
   git pull
   git submodule update --recursive --init
 fi