Increase code version to 7 and app version to 1.0.4
Merge branch 'version-1-0-4'