.
.
Merge https://github.com/nguyenthai2010/royal

Conflicts:
	wp-content/themes/aqva/css/all.css
	wp-content/themes/aqva/css/all.css.map