Add more chinese characters
Adding more characters
New Assets and qml changes to use them
Format qml files with proper indentation
More qml formatting changes
Even more QML changes
-Made some fixes with the timing accuracy using the phone
Re-introduce the Dictionary
Merge branch 'master' into william

Conflicts:
	assets/Quiz.qml