preparing pull
merge, working menu picking
water, energy bar fixed
Merge branch 'linda_branch' of https://github.com/Engman/fly into dennis_branch
update
update delete