Deleted loose files.
Updates from latest build - synchronized with Whoward's changes, updated latest happiness mechanics.
Merge branch 'master' of git@github.com:LoneGazebo/Community-Patch-DLL.git into CommunityPatchUpdates

Conflicts:
	CvGameCoreDLL_Expansion2/CvCity.cpp
	CvGameCoreDLL_Expansion2/Lua/CvLuaPlayer.h
Merge pull request #25 from LoneGazebo/CommunityPatchUpdates

Community patch updates