fix activity reordering
add config setting for "please log in" message
Merge branch 'master' into deployed-2014