added variable $active
Merge branch 'devel' of https://github.com/rajendratodkari/repo1.git
into devel

Conflicts:
	d.php
Resolved