fix
fix bug
fix bug
test
ignore file
remove
remove
Merge remote-tracking branch 'upstream/0.49' into 0.49

Conflicts:
	project.properties