config os and env branching initial checkin

for iOS, Android and blackberry
Merge branch 'master' of https://github.com/appcelerator-services/x-platform

Conflicts:
	i18n/en/strings.xml
	i18n/es/strings.xml