Update zh-HANT.coffee
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
playing with FPS
Merge branch 'master' of https://github.com/codecombat/codecombat
Update level_loading.jade

This tip was removed some time ago from the locale files.
Update pt-PT.coffee
Update pt-PT.coffee
Update pt-PT.coffee
Merge pull request #1659 from Imperadeiro98/patch-2

Update pt-PT.coffee
Fixing el.coffee merge conflicts.
Merge branch 'glls-master'
Merge pull request #1658 from Imperadeiro98/patch-1

Update level_loading.jade
Fixed zh-HANT.coffee merge conflicts.
Merge branch 'james616616-patch-1'
Added line highlighting event for iPad
Added gutter problem support for iPad