Sync changes for my announcement/announcement, login syn dialog, filter issue, campus album mearge file issue
Fixed conflicts