Merge branch 'mqtt_test' of server-git:incartech/protocol_srv into mqtt_test

diff --cc app/src/main/java/com/enqualcomm/support/Config.java
Simple merge

diff --cc app/src/main/java/com/enqualcomm/support/CoreService.java
Simple merge

diff --cc app/src/main/java/com/enqualcomm/support/ICSmsManager.java
Simple merge

diff --cc app/src/main/java/com/enqualcomm/support/utils/Util.java
Simple merge

diff --cc app/src/main/java/com/ic/protocols/protocol_ic.java
Simple merge