Test of changes to Button.js
Changes to make more functional
Merge branch 'master' into enhancements

Conflicts:
	source/ContextualPopup.js
Merge pull request #1 from psarin/enhancements

Enhancements