Merge branch 'Lucas-branch'
fixed bug for pushpin
Merge branch 'master' into chr
Merge branch 'chr'
Merge branch 'master' into Lucas-branch
Add update button and some code

see above