Minor Fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/prototype/ryersonapp/ExploreActivity.java
	app/src/main/res/layout/activity_explore_card_epandable.xml
Minor Fixes