Added updated icon. No overlap, new font on WORDS.
Merge branch 'release-amazon' into release (new icon)

* release-amazon:
  Added updated icon. No overlap, new font on WORDS.
Recolored + / - buttons to be more akin to our color scheme.
A lot of work to address the crash bugs resulting from vanishing refs.

This was a result of a a lack of serialization and the activities
being recreated. This is fixed by serializing activity state as well
as the entire game manager.
Serializing the Game Manager on pause at game and turn end.

This will allow them to be restored properly if necesary.
Fixing the blank card issue on state restore.

This fixes the problem of blank cards after state change by flipping
the view flipper if necessary.
Fix to issue where music would not replay looping when returned to from background.
Reworked timer to initialize properly. This helps when restoring serialized data.
Addressing crash issues on the start dialog and when pausing.
Fixed padding on timer frame piece on hdpi devices.
Merge branch 'SaveStateCrashFix' into release-lite

* SaveStateCrashFix:
  Fixed padding on timer frame piece on hdpi devices.
  Addressing crash issues on the start dialog and when pausing.
  Reworked timer to initialize properly. This helps when restoring serialized data.
  Fix to issue where music would not replay looping when returned to from background.
  Fixing the blank card issue on state restore.
  Serializing the Game Manager on pause at game and turn end.
  A lot of work to address the crash bugs resulting from vanishing refs.
  Recolored + / - buttons to be more akin to our color scheme.
  Added updated icon. No overlap, new font on WORDS.

Conflicts:
	res/drawable-hdpi/icon.png
	res/drawable-ldpi/icon.png
	res/drawable-mdpi/icon.png
	res/drawable-xhdpi/icon.png
	src/com/buzzwordslite/Consts.java
	src/com/buzzwordslite/Deck.java
	src/com/buzzwordslite/GameEndActivity.java