15/11/2014
18/11/2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	CitySeeker/bin/AndroidManifest.xml
	CitySeeker/bin/R.txt
	CitySeeker/bin/classes/android/support/v7/appcompat/R$attr.class
	CitySeeker/bin/classes/android/support/v7/appcompat/R$color.class
	CitySeeker/bin/classes/android/support/v7/appcompat/R$dimen.class
	CitySeeker/bin/classes/android/support/v7/appcompat/R$id.class
	CitySeeker/bin/classes/android/support/v7/appcompat/R$integer.class
	CitySeeker/bin/classes/android/support/v7/appcompat/R$string.class
	CitySeeker/bin/classes/android/support/v7/appcompat/R$styleable.class
	CitySeeker/bin/classes/com/aman/seeker/DashBoard$PlaceholderFragment.class
	CitySeeker/bin/classes/com/aman/seeker/DashBoard.class
	CitySeeker/bin/classes/com/aman/seeker/NavigationDrawerFragment$1.class
	CitySeeker/bin/classes/com/aman/seeker/NavigationDrawerFragment$2.class
	CitySeeker/bin/classes/com/aman/seeker/NavigationDrawerFragment$3.class
	CitySeeker/bin/classes/com/aman/seeker/NavigationDrawerFragment.class
	CitySeeker/bin/classes/com/aman/seeker/R$attr.class
	CitySeeker/bin/classes/com/aman/seeker/R$bool.class
	CitySeeker/bin/classes/com/aman/seeker/R$color.class
	CitySeeker/bin/classes/com/aman/seeker/R$dimen.class
	CitySeeker/bin/classes/com/aman/seeker/R$drawable.class
	CitySeeker/bin/classes/com/aman/seeker/R$id.class
	CitySeeker/bin/classes/com/aman/seeker/R$integer.class
	CitySeeker/bin/classes/com/aman/seeker/R$layout.class
	CitySeeker/bin/classes/com/aman/seeker/R$menu.class
	CitySeeker/bin/classes/com/aman/seeker/R$string.class
	CitySeeker/bin/classes/com/aman/seeker/R$style.class
	CitySeeker/bin/classes/com/aman/seeker/R$styleable.class
	CitySeeker/res/layout/activity_login_option.xml