rename Asset.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	Button.php
	Widget.php