Initial Home Screen
Merge remote-tracking branch 'origin/master'
Import
Merge remote-tracking branch 'origin/master'
Fixing some issues