integrate latest changes
update missed files
Merge branch 'master' of github.com:hqtan/healthhack2013
add pan and zoom