commit for rebase
Merge branch 'master' of https://github.com/aerobless/ToxicTodo.git

Conflicts:
	ToxicTodo/src/ch/theowinter/toxictodo/client/ui/view/SettingsPanel.java