added NUnit & Moq
Merge branch 'master' into feature/database

* master:
  added NUnit & Moq