* update login
* test
Merge branch 'master' of https://github.com/rreimi/jynx

Conflicts:
	app/routes.php
Merge branch 'master' of https://github.com/rreimi/jynx
Changed language file
Merge branch 'master' of https://github.com/rreimi/jynx

Conflicts:
	app/routes.php
* Added complete login
Merge branch 'master' of https://github.com/rreimi/jynx