Brick conflict resolve and WaitAction implementation.
WaitAction add.
Merge branch 'FormulaEditorHobelMerge' of https://github.com/Catrobat/Catroid into FormulaEditorHobelMerge