New version with proper interface
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/css/main.css
	index.php
	lamps.xml
	switchlamp.php