Merge remote-tracking branch 'origin/master'

Conflicts:
	dwo-android.iml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	app/build.gradle
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Account Students works correctly.