Layout updated
Merge branch 'develop' of github.com:VirtualTherapist/virtualtherapist-app into develop

Conflicts:
	app/src/main/res/drawable-hdpi/therapist.jpg
	app/src/main/res/drawable-xhdpi/bubble_a.9.png
	app/src/main/res/drawable-xhdpi/bubble_b.9.png
	app/src/main/res/values/colors.xml
Sidebar voor de mainactivity toegevoegd
Background color op de chat naar wit gezet
Added mood dialog and location check
Merge branch 'feature/addmenubar' into develop
Added chatContext
Merge branch 'feature/27' into develop

Conflicts:
	app/src/main/java/com/virtual/therapist/android/Activities/ChatBubbleActivity.java
	app/src/main/java/com/virtual/therapist/android/Config/Variables.java
sessionmanager toegecvoegd zodat je ingelogd blijft o.a.
Authentication token toegevoegd aan de ssdsions
Created unit test for api client
Merge branch 'feature/unittests' into develop

Conflicts:
	app/src/main/java/com/virtual/therapist/android/Config/Variables.java
Sending question finished to work with teh webserver
Merge branch 'develop' of https://github.com/VirtualTherapist/virtualtherapist-app into feature/session_auth

Conflicts:
	app/src/main/java/com/virtual/therapist/android/Config/Variables.java
Merge branch 'feature/session_auth' into develop
rating dialog
api call to save rating
Merge branch 'feature/rating' into develop
changed rating to 5 stars
Added animated .gif, animates when talking.
Merge branch 'feature/74' into develop

Conflicts:
	app/src/main/java/com/virtual/therapist/android/Config/Variables.java