Added DAO interfaces, basic annotations to entities
Merge commit 'a0561d3693e53b06199604429c5b45ce415bd1a6'