files ok
Merge branch 'master' of https://github.com/bwdk/boostripes0702

Conflicts:
	sqlsave