Merge remote-tracking branch 'beta/master'

Conflicts:
	data/skin_default/spinner/wait1.png
	data/skin_default/spinner/wait2.png
	data/skin_default/spinner/wait3.png
	data/skin_default/spinner/wait4.png
	data/skin_default/spinner/wait5.png
	data/skin_default/spinner/wait6.png
	data/skin_default/spinner/wait7.png
	data/skin_default/spinner/wait8.png
Merge remote-tracking branch 'hdf/master'