Loaded into pre-prod 17:00 18/4/13
Merge remote-tracking branch 'refs/remotes/origin/BBA-Power-V4.0' into BBA-Power-V4.0
fixed last commit error. #241
Merge remote-tracking branch 'origin/BBA-Power-V4.0'

Conflicts:
	application/modules/power/services/Version.php