Merge branch 'develop' of https://github.com/nukeviet/nukeviet into develop

Conflicts:
	themes/responsive/css/style.css
Merge branch 'develop' of https://github.com/nukeviet/nukeviet into develop

Conflicts:
	themes/responsive/css/style.css