discovery improvements
Merge branch 'master' into dev
code cleanup
Merge branch 'master' into dev
events
fix
more discovery
fix
fixes
mailer_views
code cleanup
cleanup
cleanup
cleanup
cleanup
code cleanup
cleanup
uninterests
ericsson template
merge fix