Merge branch 'slick666-master'
change stuff.ordered_dict to OrderedDict
fix for choose last activity with tag