Victor Woeltjen 67d1201214 Merge branch 'open-master' into open1272 ...

Merge in latest from master branch into topic branch
for WTD-1272

Conflicts:
	platform/forms/test/controllers/DateTimeControllerSpec.js

2015-06-19 13:16:33 -07:00

..

ColorControllerSpec.js

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

CompositeControllerSpec.js

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

DateTimeControllerSpec.js

Merge branch 'open-master' into open1272

2015-06-19 13:16:33 -07:00

DialogButtonControllerSpec.js

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

FormControllerSpec.js

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00