Merge branch 'clc2-master2'
Styling changes and dialogs show correct img if we have pic
merging Ashleys changes
updating some layout
puzzle layout
puzzle layout
anagram layout
Rollback before merge and some code clean up
Styling changes to put things in generally the correct area
partial ficx
a
Transitions between screens no longer have an intermediate black screen
Merge remote-tracking branch 'upstream/master' into transitions
a
a
Merge branch 'syqnew-styling-changes-1'
adding fadeIn fade out activities based on Jennifer sample
Committing
fixing api key
strings