(fix) repository structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/phisicaltraining/mil/com/phisicaltraining/UserInfoActivity.java