merging into master

@Omar-ElAzazy @mohamed19936 @SalmaAmrAhmed @sak93 : guys, please check the added files. Its time to merge into master. Once everyone of us agrees on that, last reviewer will merge