minor changes
minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/andex/service/BaseServiceBinder.java
	test/andex/model/FileDataSourceTest.java