gege
Merge branch 'master' of https://github.com/Elekron/main

Conflicts:
	resources/oauth.properties