Victor Woeltjen de6dfe1fdc Merge remote-tracking branch 'github/master' into mobile ...

Merge in latest from master into mobile branch
to reconcile conflicts

Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js

2015-09-10 15:01:38 -07:00

..

actions

Merge remote-tracking branch 'github/master' into mobile

2015-09-10 15:01:38 -07:00

capabilities

[Code Style] Fix bug introduced by refactor

2015-08-12 13:57:17 -07:00

controllers

[Code Style] Use prototypes in Edit bundle

2015-08-10 16:38:13 -07:00

directives

[JSDoc] Add annotations

2015-08-07 11:44:54 -07:00

objects

[Code Style] Use prototypes in Edit bundle

2015-08-10 16:38:13 -07:00

policies

[Code Style] Use prototypes in Edit bundle

2015-08-10 16:38:13 -07:00

representers

[Code Style] Avoid copying window/scope

2015-08-11 11:00:56 -07:00