New Testing framework, Update to Java 7
Merge branch 'development' of github.com:VHAINNOVATIONS/Innovation-182 into development