Cleaned and adjusted routes, controllers, login
Merge remote-tracking branch 'origin/master'