modified:   ide/src/deverl.erl
	modified:   ide/src/deverl_console_wx.erl
	modified:   ide/src/deverl_dialyzer.erl
	modified:   ide/src/deverl_dlg_data_find_wx.erl
	modified:   ide/src/deverl_editor_theme.erl
Merge branch 'master' of https://github.com/tomrichmond/erlangIDE

Conflicts:
	deverl/src/deverl.erl
	deverl/src/deverl_dialyzer.erl
	deverl/src/deverl_dlg_data_find_wx.erl
	deverl/src/deverl_editor_theme.erl
	modified:   src/deverl.erl
	modified:   src/deverl_dialyzer.erl
	modified:   src/deverl_dlg_data_find_wx.erl
	modified:   src/deverl_editor_theme.erl
	modified:   src/deverl_sl_wx.erl