Added basic resources for app
Merge remote-tracking branch 'origin/master'