issue fixed
res added
conflicts fixed
Merge branch 'master' of https://github.com/zoho/creator-java

Conflicts:
	build/ant.properties
	res/ResourceString.properties
	src/com/zoho/creator/jframework/XMLParser.java
	src/com/zoho/creator/jframework/ZOHOCreator.java