Test button with 2
Merge remote-tracking branch 'origin/Test' into Test

Conflicts:
	TestButton/WebContent/testbutton/myview.view.js