Rony: Build theme 20130205
Merge branch 'master' of https://github.com/hoangnhien137/angelbeauty

Conflicts:
	wp-content/themes/angelbeauty/single-question-and-answer.php
	wp-content/themes/angelbeauty/single.php