Picking up missing commits

Few missing commits has been rebased. Also, few commits that are for language translation are ignored. They are for creating Persian only pages.