cleanup
Merge branch 'master' of github-juniper:awallar/sqlTemplate

Conflicts:
	migrationsql.vm
Merge branch 'master' of github-juniper:awallar/sqlTemplate

Conflicts:
	migrationsql.vm