login with version 5 works
Merge remote-tracking branch 'origin/pivotalTracker' into pivotalTracker

Conflicts:
	app/src/main/java/com/EDA397/Navigator/NaviGitator/Activities/MainActivity.java
	app/src/main/java/com/EDA397/Navigator/NaviGitator/SupportFunctions/PivotalFunctionality.java
"