Fixed Routes
Merge remote-tracking branch 'jeisson/master'

Conflicts:
	index.php
Added the "getCurrentUrl" and "getUrlFor" functions.