Setting correct username in database
Merge branch 'develop' of https://github.com/EdenServers/EdenManager into develop

Conflicts:
	modules/scrolls/scroll.rb