Small Fixes on Server & Android Client
Merge branch 'master' of https://github.com/raguiar9080/CMOV_Mobile_Payment