first step
Merge branch 'master' of https://github.com/mmoactrpg/GameEngineFramework

Conflicts:
	.gitignore
update gitignore to vs2012 support