added android apps and ideation software
update hp
fixed merge