s03us46-User: User separated according to MVC. Problem with non-existing
users.
s03us46-User: Shows a toast if there is no user with the given id
s03us46-User: Test for not existing user ids added
s03us46-User: Added test case
s03us46-User: Working User profile with two test cases and added buttons
to main page
s03us46-User: Added comments
Completed s04-us46 - Making QnA profile pictures clickable.
Merge remote-tracking branch 'origin/s04-us46' into dev

Conflicts:
	src/com/yinyang/so/activities/QuestionActivity.java
	src/com/yinyang/so/controllers/QuestionController.java
s04-us60: added connection from tabs in QuestionActivity to
TabSearchActivity
s04-us60: question activity, minor changes
Merge remote-tracking branch 'origin/s03us46-User' into dev

Conflicts:
	AndroidManifest.xml
	res/layout/activity_main.xml
	res/values/strings.xml
	src/com/yinyang/so/activities/MainActivity.java
	src/com/yinyang/so/controllers/Controller.java
	src/com/yinyang/so/database/DatabaseAdapter.java
	tests/.classpath
	tests/.gitignore
	tests/AndroidManifest.xml
	tests/bin/AndroidManifest.xml
Merge branch 'dev' of https://github.com/danidanone17/YinYangApp.git into dev
us56
Merge remote-tracking branch 'origin/s04-us56-local' into dev

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/yinyang/so/activities/SearchResultActivity.java
	src/com/yinyang/so/database/DatabaseAdapter.java
us56 - updated the limit search result to 100 posts at the
getQuestionsByFreeTextAndTags method
us56: Added test case for descending order
Merge branch 'dev' of https://github.com/danidanone17/YinYangApp.git into dev