bumped version string
Merge branch 'release/2013-05.04' into develop