savanna-manage has been added;
reset-db/gen-templates moved to it

Change-Id: I2034e65d4c8b61d8084729eb455c450370cfcc8b