l
Merge branch 'master' of github.com:Tamazy/Biskanah

Conflicts:
	SQL/BiskanahV1.mwb
	SQL/BiskanahV1.sql
	SQL/worldsGenerate.php
Merge branch 'master' of github.com:Tamazy/Biskanah
message team invit controller