Version 1.2.0
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI into dev