Merged latest trunk changes into scripting-branch

diff --cc armsrc/appmain.c
index cecf4d35e1156774fa02b26d0c997cdd08f986b8,4477a12025d043df0e5969af81a867ab3adca182..cfde4fbb63733bf87d257eed430e1fd9a2e36c64
--- 1/armsrc/appmain.c
--- 2/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@@ -877,15 -880,15 +880,15 @@@ void UsbPacketReceived(uint8_t *packet
        //                      UsbSendPacket((uint8_t *)&n, sizeof(n));
        //                      LED_B_OFF();
  
-       LED_B_ON();
-       for(size_t i=0; i<c->arg[1]; i += USB_CMD_DATA_SIZE) {
-         size_t len = MIN((c->arg[1] - i),USB_CMD_DATA_SIZE);
-         cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K,i,len,0,((byte_t*)BigBuf)+c->arg[0]+i,len);
-       }
-       // Trigger a finish downloading signal with an ACK frame
-       cmd_send(CMD_ACK,0,0,0,0,0);
+                       LED_B_ON();
+                       for(size_t i=0; i<c->arg[1]; i += USB_CMD_DATA_SIZE) {
+                               size_t len = MIN((c->arg[1] - i),USB_CMD_DATA_SIZE);
+                               cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K,i,len,0,((byte_t*)BigBuf)+c->arg[0]+i,len);
+                       }
+                       // Trigger a finish downloading signal with an ACK frame
+                       cmd_send(CMD_ACK,0,0,0,0,0);
                        LED_B_OFF();
 -                      break;
 +              } break;
  
                case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
                        uint8_t *b = (uint8_t *)BigBuf;

diff --cc client/Makefile
index 1f2f23e87442dac671d5925e5d7c9b478a25dc9c,ff701a9f637f5b609e1c32a3298e8cb0630fe561..b7376c92b3b21c9a286bac5c1e67d5b9cdcb5c80
--- 1/client/Makefile
--- 2/client/Makefile
+++ b/client/Makefile
@@@ -32,7 -28,8 +32,9 @@@ els
  CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
  QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
  MOC = $(shell pkg-config --variable=moc_location QtCore)
+ # Below is a variant you can use if you have problems compiling with QT5 on ubuntu. see http://www.proxmark.org/forum/viewtopic.php?id=1661 for more info. 
+ #MOC = /usr/lib/x86_64-linux-gnu/qt4/bin/moc
 +LUAPLATFORM = linux
  endif
  
  

diff --cc client/cmdmain.c
index 9da1b308282fc53d21c4a6b125c8c7bb6c3c9cb3,64e0c1b461e34dda45ca8ffe871f7887b5ba6d21..b6f32adacf158691a22c6a6ef353d358a0ac121f
--- 1/client/cmdmain.c
--- 2/client/cmdmain.c
+++ b/client/cmdmain.c
@@@ -24,8 -24,8 +24,9 @@@
  #include "cmdlf.h"
  #include "cmdmain.h"
  #include "util.h"
 +#include "cmdscript.h"
  
+ 
  unsigned int current_command = CMD_UNKNOWN;
  //unsigned int received_command = CMD_UNKNOWN;
  //UsbCommand current_response;