P-03E
P-03E
Merge pull request #17 from tobise/patch-1

Conflicts:
	device_database.h
Merge branch 'tobise-patch-1'