added heart picture
added smile pictures
Merge branch 'VoodooUI' of https://github.com/eicke123/lattegotchi into VoodooUI
remove
fix warning
add emotion
add heart
refactoring
Merge branch 'VoodooUI'

Conflicts:
	LAttegotchi.xcodeproj/project.pbxproj
	LAttegotchi/LAttegotchi-Info.plist
refactoring
Merge branch 'master' of https://github.com/eicke123/lattegotchi