htaccess
Merge branch 'master' of https://github.com/dpitkevics/DAPS-V4

Conflicts:
	.htaccess
	framework/libs/Uri.class.php