Merge with production update 08/22/2013
Merge branch 'master' of https://github.com/lifemapper/lmCore.git