Initial Import
Merge branch 'master' of https://github.com/danitxu/android1-danitxu