Merge pull request #5 from nukeviet/develop

Update code from nukeviet (13/05/2014)
Change image height config
Format code
Merge pull request #6 from nukeviet/develop

Update code from nukeviet (17/05/2014)
Update tab detail
Merge remote-tracking branch 'hongoctrien/develop' into develop

Conflicts:
	themes/default/modules/shops/detail.tpl