30/11/2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	CitySeeker/gen/com/aman/seeker/R.java
	CitySeeker/gen/com/google/android/gms/R.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	CitySeeker/src/com/aman/fragments/Frag_NewsFeed.java