updated greek translation
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/locale/el.coffee
Merge remote-tracking branch 'upstream/master'
Greek translation update
Fixing el.coffee merge conflicts.
Merge branch 'glls-master'