updating master branch with new ngWidApp changes