2 new commits pushed to

<https://github.com/jmpsec/osctrl/tree/develop|develop>

by javuto

<https://github.com/jmpsec/osctrl/commit/361e1f56166edd784ae54ff298f2ef67cbb339b6|361e1f56>

- Moving activity to main node view

<https://github.com/jmpsec/osctrl/commit/a6cf4d165fb8a2f428313f0b952919928d56506b|a6cf4d16>

- Merge pull request #867 from jmpsec/activity-node-frontend jmpsec/osctrl