Merge branch 'master' of /home/aiste/PhpstormProjects/GameDB with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Added email confirmation