- popup ng-editable
Merge origin/master