change 1
save 2
save
save 2
save 3
remove debug code
Merge branch 'mod_announce_test' into integration
remove debug code
Merge branch 'msg_expire' into integration

Conflicts:
	src/mod_offline.erl
remove my_ebin dir
Merge branch 'integration' into dew