merge conflict
merge conflict
merge
Merge branch 'develop' of https://github.com/VirtualTherapist/virtualtherapist-app into develop

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