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

Conflicts:
	images/back1.png
	images/datab1.png
	images/logs1.png
	images/proj1.png
	images/users1.png
	includes/sidebar.php
	php/admin.php