Merge pull request #36 from nukeviet/develop

Update code from nukeviet (28/04/2014)
Fix load config theme default
Merge remote-tracking branch 'nukeviet/develop' into develop

Conflicts:
	themes/default/config_default.php
Remove test code
Default: add note config
Format code
Merge pull request #239 from hongoctrien/develop

Fix load config theme default