Merge branch 'master' of /home/masoud/parsidan/parsidan with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	parsidan/i18n/en/LC_MESSAGES/parsidan.po
	parsidan/i18n/fa/LC_MESSAGES/parsidan.po
Some translation