add item activity
modify parser json data
temp commit
fixed conflict