Merge branch 'V2.1' of https://github.com/haiyupeter/operamasks-ui.git
into V2.1

Conflicts:
	WebContent/themes/elegant/images/messagebox/title-bg.png
	WebContent/themes/elegant/om-messagebox.css
Merge branch 'V2.1' of https://github.com/haiyupeter/operamasks-ui.git
into V2.1