change database model; add service pages; TODO: DB connection pooling
fix confict b/w branches: 'current' and 'dev'