Starting to recieve news
Merge remote-tracking branch 'origin/Follow-Dj'

Conflicts:
	Where2Night/AndroidManifest.xml
	Where2Night/gen/com/where2night/R.java
	Where2Night/res/values/strings.xml
	Where2Night/src/es/where2night/adapters/AdapterItemLocal.java
	Where2Night/src/es/where2night/fragments/HomeFragment.java
	Where2Night/src/es/where2night/fragments/LocalsFragment.java
	Where2Night/src/es/where2night/fragments/MapFragment.java