Merge remote-tracking branch 'origin/develop' into develop
* Cleanup
* Reload list after form submit
* Added labels for missing features