fix
fix bug
fix bug
test
ignore file
remove
remove
1
Merge branch 'pr/8' into 0.49

Conflicts:
	.gitignore
	project.properties