Renamed. Please don't commit.
Improved add() and update()
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
Merge remote-tracking branch 'origin/master'