button settings removed
Merge branch 'master' of https://github.com/icedkiller/JDB

Conflicts:
	tp04/src/ca/qc/cegepsth/jdb/view/WriteLogActivity.java