Orlandov

Merge from master added database tables