'
Merge branch 'master' of github.com:nguyenthai2010/Musician

Conflicts:
	wp-content/themes/musician/all-src.js
	wp-content/themes/musician/all.js
	wp-content/themes/musician/css/all.css.map