Cleaned up layout changes
Merge branch 'master' of https://github.com/zephos64/CodePathAdHoc.git

Conflicts:
	AdHoc/src/com/codepath/adhoc/application/EventsAdapter.java