Upper level changes part 1
Merge branch 'five-dev' of https://github.com/mhacks/MHacks-Android into five-dev
w