Merge remote-tracking branch 'remotes/origin/test' into omar

Conflicts:
	app/src/main/java/project/kit/com/kit/MainActivity.java
Merge remote-tracking branch 'origin/master'