Changed login and home url
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/routes.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/routes.php
	app/views/settings.php
Revert "Fixed Miscellaneous Tag not working"

This reverts commit 26af94ca1db0b44a482823a71cbfe697df7cbb0b.