current route fix
sa
Merge branches 'develop' and 'develop' of https://github.com/newzifyus/newzify into develop
login fixed
Merge branch 'develop'

Conflicts:
	index.php