Add Samsung Galaxy S3 and S4 and add HTC as a manufacturer