build resources
Merge branch 'release/11/13/13' into develop