Merge develop --> angularjs