changes in dashboard , css/register , header because of nav
changes in dashboard , css/register , header because of nav
changes in dashboard , css/register , header because of nav
Merge remote-tracking branch 'origin/aram_time' into ehsan_time

Conflicts:
	.idea/workspace.xml
	application/config/config.php