modified:   admin/index.php
	modified:   main.php
Merge branch 'master' of https://github.com/txt3rob/RPI-Control