colored pins
Merge branch 'master' into chr

Conflicts:
	PostUpNow/postupnow.pyc
Merge branch 'master' into Lucas-branch
Page now gets coordinates before loading map

See above
Merge branch 'Lucas-branch'
Filler image while the map loads

See above
Merge branch 'master' into Lucas-branch
labels on pins, colored pins
Merge branch 'master' into chr

Conflicts:
	PostUpNow/postupnow.pyc
Merge branch 'chr'
stuff
Merge branch 'master' into Lucas-branch
More changes

More changes
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
Merge branch 'Lucas-branch'