removing simpleyui src changes
simpleyui remove build + build dir changes
Resolving conflicts
Adding build file changes - after yogi build
Merge branch 'staging-remove-simpleyui' into dev-master
Merging dev-master into dev-3.x