more hipchat features
merge conflicts