rename file
rename file
rename file
Merge branch 'master' into dev

Conflicts:
	test/device_client_tests.rb
add unit tests and fix auth bug