sync
Merge branch 'master' of https://github.com/crosscliq/rystband.com

Conflicts:
	apps/Rystband/Controllers/Device.php
	apps/Rystband/Views/attendee/own.php
	composer.lock
d

dd