Merge origin/master

Conflicts:
	manifest.mf
Delete build.xml
Delete manifest.mf
Delete build-impl.xml
Delete genfiles.properties
Delete project.properties
Delete project.xml
Create .gitignore
Delete project.xml
Delete project.properties
Delete genfiles.properties
Delete build-impl.xml