aug 14-15 updates
Merge remote branch 'origin/master'

Conflicts:
	dbsettings.xml
	src/gui/CenterPanel.java
	src/gui/forms/util/RowPanel.java
	src/gui/renderer/RowHighlightRenderer.java
Merge remote branch 'origin/master'