dev
Merge branch 'master' of https://github.com/kashifrao/rdc

Conflicts:
	includes/sidebar.php
	php/admin.php
	php/data_management.php
	php/logs.php
	php/sstatus.php