WhereQ
Merge branch 'master' of https://github.com/hisyamidris/LibraryTrackerProject

Conflicts:
	LibraryTracker/src/com/example/librarytracker/WhatActivity.java
	LibraryTracker/src/com/example/librarytracker/WhereActivity.java