changed map layout
Merge remote-tracking branch 'paul/development' into adnan
added login
fix login
resize world
merge
WIP
Fixed errors with flags etc.
Fixed merge conflicts.