added square root and random number functions to expression editor
Resolving conflicts