time machine issue solved
Merge branch 'Api-Update' of https://github.com/CypressXt/Sphere-Guard into Api-Update

Conflicts:
	nbproject/private/private.xml