Merge remote-tracking branch 'origin/Dev'

Conflicts:
	Nextwatt/application/controllers/test.php
	Nextwatt/nbproject/private/private.xml