Working on Rewrite system
Merge remote-tracking branch 'origin/master' into Rewrite

Conflicts:
	core/db/Connect.php
	core/settings.php
Rewrite system finalize
Merge pull request #4 from weactivist/Rewrite

Rewrite