Merge remote-tracking branch 'origin/master'

Conflicts:
	Content/candy/ipad-mainmenu.wnd