Merge pull request #255 from Kixo/master

Master
Merge branch 'master' of github.com:redCOMPONENT-COM/redCORE
Merge branch 'redCORE-1.2.0'
Merge pull request #274 from redCOMPONENT-COM/master

Master