change inbox
Merge remote-tracking branch 'origin/master'
fix issues
add dedication view controller
Merge remote-tracking branch 'origin/master'
merge