addin gsamples
Merge branch 'api_work' of https://github.com/jontreble/Lumberjack into api_work

Conflicts:
	api.py
	controllers/TrackingLogController.py
resolving merge conflit