code formatting
performance improvements in entries/mix
bumped version string
Merge branch 'release/2013-06.04' into develop