wishes view
update animation moved
Merge branch 'VoodooUI'

* VoodooUI:
  wishes view update animation moved

Conflicts:
	LAttegotchi/AppDelegate.m