Initial push from production server
Fix merge conflict
Add the 'Coming Soon' page