First custom app version live on localhost
Merge remote-tracking branch 'origin/dev' into dev