Merge branch 'master' into google-login

Conflicts:
	app/app.iml
	app/src/main/AndroidManifest.xml
	app/src/main/java/getresultsapp/sointeractve/pl/getresultsapp/config/Settings.java
	app/src/main/java/getresultsapp/sointeractve/pl/getresultsapp/fragments/ProfileFragment.java
	app/src/main/res/layout/activity_login.xml