remove local.properties
Make the cleaning / building of the database.zip part of the normal ant build.
remove database.zip
Merge branch 'master' of github.com:aurelienz/jumble
use the internal storage instead of the SD card and rename "Colors" by "Colours"
update the target sdk
For ICS we need to set the LayoutParams after the view gets added to the grid.

Conflicts:
	AndroidManifest.xml
	src/com/morphoss/jumble/frontend/CategoryScreenActivity.java
Some of these values are not defined for ICS, so we define them locally.
Remove unnecessary @suppress
Scale this a little smaller.
It's cleaner to return an int count rather than the whole adapter.

Ideally all dealing with the adapter should be mediated by the activity,
to remove any possibility of careless side-effects.

Conflicts:
	src/com/morphoss/jumble/frontend/WinningActivity.java
Remove unnecessary duplicate variables.

Conflicts:
	src/com/morphoss/jumble/frontend/JumbleActivity.java
Missed this change during merge.
Ignore the secure.properties file.
set the alpha for the winning screen when there is a popup window and change the way to get the language to load
So when the tablet is in french, the app will start in french

Conflicts:
	AndroidManifest.xml
set the alpha for the jumble screen when we use the hint (popup window)
resize the locker on category screen and set an alpha background for the popup windows
scale the category images
change the way of storing words and scores in the database
change the algorithm to sort the words