update from github
update from github
Merge branch 'master' of https://github.com/robin521111/InforwebMvc4

Conflicts:
	CommunityDesigner/Generated_Code/LeduInfo.g.cs
	LeduInfo/ClientBin/CommunityDesigner.xap
	LeduInfo/Controllers/VoteController.cs
	LeduInfo/packages.config
Merge branch 'master' of https://github.com/robin521111/InforwebMvc4

Conflicts:
	CommunityDesigner/Generated_Code/LeduInfo.g.cs
	LeduInfo/ClientBin/CommunityDesigner.xap