Include Junit Tests
Merge origin/develop into develop