sync
Merge branch 'master' of github.com:shanem/wordsprout

Conflicts:
	src/com/lauren/wordsprout/IdentifyActivity.java
	src/com/lauren/wordsprout/ImageActivity.java