Resources_Stones Model and View changes
Merge branch 'master' into resource