Master
Master
Merge branch 'master' of https://github.com/TagYourIt/VietNews

Conflicts:
	Resources/.DS_Store