Merge branch 'release/2013-06.04' into develop
#
Setting model is now cached
fixes email addresses in admin user index are link instead of mailto
bumped version string
Merge branch 'release/2013-06.05'