Bug 821065 - Add wildcard event.
Bug 787392 - Add Action/Toggle Button type

- Added Button UI component
- Added "State" mechanism
- Implemented CustomizableUI from Australis
- Added Unit Test
Merge pull request #1038 from ZER0/ui-button

Bug 787392 - Add Action/Toggle Button type r=@erikvold
Bug 787395 Adding a Sidebar module r=@ZER0

Conflicts:
	test/test-url.js
Bug 890755: sidebar.js throws TypeError ("sidebar is null") when browser dialogs are closed
Bug 889204 testing sidebar event listeners thoroughly
Merge pull request #1095 from erikvold/889204

Bug 889204 testing sidebar event listeners thoroughly r=@jsantell
Merge remote-tracking branch 'upstream/master' into australis
Bug 894624 - The test suite for new UI components should run only on Australis

- Added module.metadata to test suite
- Added `assert.throws` when testing property with only getter and not setter
Merge branch 'australis' of git://github.com/mozilla/addon-sdk into 890755

Conflicts:
	test/test-ui-sidebar.js
Merge pull request #1084 from erikvold/890755

Bug 890755: sidebar.js throws TypeError ("sidebar is null") when browser dialogs are closed r=@ZER0
Merge pull request #1113 from ZER0/test-ui/894624

 fix Bug 894624 - The test suite for new UI components should run only on Australis r=@erikvold
Implement `getActiveView` after binding is inited.
Bug 863946: mozrunner: support FreeBSD

Running `cfx test` fails on FreeBSD because it can't find the
application binary.  Specifying the application binary results in no
activity or output.

Recognise FreeBSD in ``sys.platform`` and look for the "firefox"
binary on FreeBSD.
809362 Fix test-tab tests on Fennec, make properties undefined after closing tab
Revert "Merge pull request #1118 from Gozala/hotfix/net-io" to green things up for another merge to m-c

This reverts commit 23da9889e24f1536ae17c17391e0c5dd3bc8eed3, reversing
changes made to 2a40cf47944fb9e1b45ec019a5495b86d39d0233.

Conflicts:

	lib/sdk/io/net.js
Bug 892221 cleanup unsupported tests in Fennec
bug 863502 fix fennec test-tab-events
Merge pull request #1130 from jsantell/863502-fennec-tab-events-fix

Fix bug 863502, fennec test-tab-events, r=@gozala
892408 fix intermittent bookmarks resolution errors