set correct max size for mega2560 (to address issue #2277)

Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
Merge pull request #2316 from championswimmer/1.0.x-fixMaxMega

set correct max size for mega2560 (to address issue #2277)
Fix typo in KeyboardLogout.ino

Comment says ALT+s, code says ALT+l. This remedies that difference.
Merge pull request #2329 from Unh0lyTigg/patch-1

Fix typo in KeyboardLogout.ino
Merge branch 'master' into ide-1.5.x. Updated revision log.

Conflicts:
	build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
	hardware/arduino/boards.txt