update
added version info
Merge branch 'desktop' into mobiledev

Conflicts:
	project.properties