move action back
Merge branches '1.2' and '1.2' of github.com:pagelines/DMS into 1.2