Merge branch 'master' of github.com:rnecesito/k3l1kjf90rl

Conflicts:
	app/src/main/java/com/example/sgm/japgolfapp/registration/LoginFragment.java
	app/src/main/java/com/example/sgm/japgolfapp/registration/MainMenuFragment.java
	app/src/main/res/layout/fragment_bet_registration.xml
	app/src/main/res/layout/fragment_login.xml
	app/src/main/res/values/strings.xml
Merge remote-tracking branch 'origin/master'