no message
Merge branch 'master' of https://github.com/htphongqn/DynamicWebsite

Conflicts:
	DynamicWebsite/DynamicWebsite.csproj