Merge
Merge https://github.com/nekoprog/toqei

Conflicts:
	package/contents/ui/main.qml
	package/metadata.desktop