New option in campuslife TransitInfo complete (no known bugs)
Turned on settings for analytics options
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/ca/informeapps/informeryerson/CampusLife/CampusLifeFragment.java
New option in campuslife TransitInfo complete (no known bugs)
Turned on settings for analytics options