Added emotions file and attribute to PersonView.
Merge remote-tracking branch 'origin/master'

Conflicts:
	bad-vibes-game/src/com/mobi/badvibes/view/PersonView.java