Cleaned up MainActivity
Merge branch 'Refactor-5_15_2014'

* Refactor-5_15_2014:
  Cleaned up MainActivity