Merge to develop

Χάρης Παπαδόπουλος requested to merge harisrnd/e-epal:edge_v4 into develop Aug 03, 2017