fixed happiness stat and removed blue border
Merge branch 'master' into bugscores_toxp
Merge pull request #111 from red-admirals-2014/bugscores_toxp

Bugscores toxp