JR device registration fix
Merge branch 'master' of https://github.com/lstables/clockin1

Conflicts:
	admin/application/views/devices/calibrate.php
	admin/js/device-registration.js