Minor: ????
What's wrong?
Merge branch 'dev' of https://github.com/Kreogist/Cuties into dev

Conflicts:
	src/app/kcpreferenceembedded.cpp