convert test to new style
register tests using new style
Changing cdvtest format to use module exports
Merge branch 'master' into cdvtest

Conflicts:
	plugin.xml
Removed js-module for tests from plugin.xml
CB-7148 Added manual tests
Renamed test dir, added nested plugin.xml
fix merge issue