Preparation for preferences window
Merge branch 'master' of https://github.com/sebastianludwig/ErgoTyper

Resolved conflicts:
	ErgoTyper.xcodeproj/project.pbxproj
Fixed half written line of code..