Added view for resource not found.
Merge remote-tracking branch 'origin/master'