Merge branch 'master' of https://github.com/coldstorm/AndroCS.git

Conflicts:
	build.xml
	codenameone_settings.properties
	manifest.mf
	nbproject/project.properties
	nbproject/project.xml
Add /dist/ and /build/ to .gitignore