Added some assets and prepared for settings view controller
Merge remote-tracking branch 'origin/master'