Esbozo vista de los locales
Merge rama Isma

Conflicts:
	Where2Night/AndroidManifest.xml
	Where2Night/gen/com/where2night/R.java
	Where2Night/res/values/strings.xml

	modified:   Where2Night/AndroidManifest.xml
	modified:   Where2Night/gen/com/where2night/R.java
	new file:   Where2Night/res/layout/activity_local_view.xml
	modified:   Where2Night/res/layout/fragment_friends.xml
	new file:   Where2Night/res/layout/fragment_local_view.xml
	new file:   Where2Night/res/menu/local_view.xml
	modified:   Where2Night/res/values/strings.xml
	new file:   Where2Night/src/com/where2night/activities/LocalViewActivity.java
	modified:   Where2Night/src/com/where2night/activities/MainActivity.java
	new file:   Where2Night/src/com/where2night/fragments/LocalViewFragment.java
	modified:   Where2Night/src/com/where2night/fragments/LocalsFragment.java
	new file:   Where2Night/src/com/where2night/utilities/ObservableScrollView.java