Merge from parent

Reverted password loading in PAGE_SETUP, changed the value of passwordlength to save, added clearing of hashes after a 'Wrong password' RetryDialog

Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated

fixed minor problem with saving hash

Removed whitespaces, refactored hash setting getting and clearing

Removed commented-out unused code

*sigh*

Patched login dialog bugs, added retry dialogs

Try to be friendlier to small screen sizes. Use 800x600 if width/height of 2/3rds is smaller than 800x600 (things don't look smaller than that size), use desktop size if it is for some reason smaller than 800x600

uint32_t -> quint32

Fix linux build broken in ra1577759bf62 (probably)

Fix non-osx build broken in ra874d00df4a4. Dudes... :(

Fix windows build broken in raf97cdbb7713

cmake set variable and typo

GCI2012: Autoupdate Button in Settings

cmake verbosity/documentation/cleanup/formatting

Implement some more callbacks

partially revert r1fba650c2aa4 on misc/physfs/CMakeLists.txt which randomly set true and false variables

Delete poller when game is over

less linking needed, raise minimum_osx_version when videorec is enabled

Merge with default

hides the 'email' prompt on the feedback page (as that doesn't work, so it's a misleading/useless feature), makes the "please add your email" text a little nicer and more noticeable, and makes the "feedback" and "downloadable content" buttons on the main menu a little bit larger, and more clickable.

Some fixes

Unbreak build

Unbreak build

removing the optimisation that caused (most likely) the lua crashes on osx

removing the optimisation that caused (most likely) the lua crashes on osx

strip available ram entry, add notice for entering email

strip available ram entry, add notice for entering email

GCI2012: Google Issue Login