Alikins/server side status master merge

proposed merge of server-side-status to master (most of conflicts were plugin related)