testbranch commit
master commit
Merge branch 'testbranch'

Conflicts:
	CasperTest/TestMvc4App/Views/Home/Index.cshtml