Adding buttons resources
Merge branch 'developing'