fcs within/across group & directory
fixing conflicts
Merge branch 'master' of github.com:shahabhameed/Clonify

Conflicts:
	WebSite/application/views/partials/sidebar.php
	WebSite/assets/js/main.js