Sorted activities in plan_to_json()
Merge branch 'master' of https://github.com/brndnthai/plantivity