Refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/chirptask/logic/DisplayView.java