added functions in studio, upgrade of angular
modified function-controller
merge with branchFunctions