Added Sort options in menu

Currently not eyes friendly. Will improve it later
Improved some strings and preferences
nothing
Iml change
Merge remote-tracking branch 'origin/master'

Conflicts:
	AmazeFileManager.iml
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AmazeFileManager.iml