new format for sql backup
Merge branch 'master' into staging

Conflicts:
	Makefile
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branches 'staging' and 'master' of github.com:hacklabr/timtec