Add rough mockups and nav code for card search pages
LoginPage with activities
Revert "LoginPage with activities"

This reverts commit 2ccfced62d27fd4638f7359a69d8018c2bfec0e8.
Implement design mockups for search/card pages

The styling from the mockups isn't in yet, but the content is there
Implement card search

Criteria limited to name for now, until support in the backend exists for the others
Fix buttons to span the width of the screen
Card viewer page uses real data from search results
Have Card Viewer info stretch to fit screen
Fix null subtypes being rendered as "null" in viewer
UI with all the activities

maybe some button functions or Navagation are wrong, I will fix them
later
UI new
UI2
UI 3
Add .DS_Store and Eclipse settings to gitignore
UI Part

Combine your part and mine. Also, all the search functions on every
page has been done.
Merge branch 'master' of git://github.com/LijiaLiu/walkingarchive-app into LijiaLiu-master

Conflicts:
	res/layout/activity_main.xml
	res/layout/card_viewer.xml
	res/layout/search.xml
	src/org/walkingarchive/app/CardViewerActivity.java
	src/org/walkingarchive/app/SearchResultsActivity.java
Merge branch 'LijiaLiu-master'
Clean up unused imports and XML warnings
Use real price data when rendering card viewer

[Fixes #47184929]
Back out code that needs to be rewritten