Merge branch 'sprint_cordoba' into 'master'

[RELEASE] Sprint cordoba

Closes #138 and #159

See merge request e/apps/BlissLauncher!18
1 job for develop in 6 minutes and 50 seconds (queued for 1 second)