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