temp commit
merging firefly stuff
added some firefly stuff.
Merge branch 'master' of github.com:inktomi/FirePhoneDemos