changes to gplus tokens
Merge branch 'master' of https://github.com/vmagro/GlassTimelapse

Conflicts:
	OverlayCreator/src/glasswhere/GPlusAPI.java
	OverlayCreator/src/glasswhere/ImageOverlay.java