Add empty view
Merge branch 'master' of github.com:cuberob/Hackathon2014

* 'master' of github.com:cuberob/Hackathon2014:
  Fixed conflicts
  Merge branch 'master' of /Users/steven/Documents/workspace/Droidcon2014/Hackathon2014 with conflicts.