try for merge of master and ACT branch
Merge branch 'master' of https://github.com/Xynnect/GroupCproject