.
Merge remote-tracking branch 'origin/master'
Facebook Login, icons, splash creen