Merge "ListActivity,User.java-remove useless assignments"