Some updates
Merge branch 'master' of github.com:Developers-RuDev/OAuth-Server

Conflicts:
	app/views/home/main.blade.php