init base 3
Merge branch 'master' of https://github.com/limbo0312/egsFramework

Conflicts:
	egsFramework/egsFramework.xcodeproj/project.pbxproj