Moved stuff around
Merge branch 'master' into my_ui

Conflicts:
	res/layout/activity_main.xml
	src/com/hackthenorth/snaplocation/view/MainActivity.java
Updated friends list
Added disableable view pager and selectable friends list