changed Question Model from holding objects to holding UUID of objects
Modified Answer to contain only comment UUID
Finished model change to UUID
Merge pull request #123 from CMPUT301F14T14/Sort

Fixed bug when hitting back button on welcome screen Issue #110
Created activity and general layout
Added dialogfragment to input query
Passed query to search activity
Searching works
Bug fixes, minor changes
Updated datamanager to UUID model
added starter code for remodeData use.
Merge pull request #124 from Kopo101/SearchActivity

Added searching activity, query strings.
I understand that this is partially complete, but functional.
FIxed all except datastore
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project into remoteDataStore
Merge branch 'NewStuff' of https://github.com/RyanKusters/Project

Conflicts:
	QuestionApp/src/ca/ualberta/cs/cmput301f14t14/questionapp/QuestionActivity.java
Adjust LocalDataStore to be compatible with the new models.
Fix a bunch of NullPointerExceptions
Seems to be stable now.
Merge branch 'dm-changes' of https://github.com/stephenjust/Project into remoteDataStore

Conflicts:
	QuestionApp/src/ca/ualberta/cs/cmput301f14t14/questionapp/model/Comment.java
	QuestionAppTests/src/ca/ualberta/cs/cmput301f14t14/questionapp/test/CommentTest.java
	QuestionAppTests/src/ca/ualberta/cs/cmput301f14t14/questionapp/test/data/RemoteDataStoreTest.java
Fixes to match DM changes