Merge pull request #1 from cydh/master

*Penerjemahan file 'doc/permissions.txt'
Follow up r1022

merge dari SVN
push npc airports
* Diterjemahkan beberapa file di folder conf:
-- atcommand_athena.conf
-- battle_athena.conf
-- channels.conf
-- charhelp.txt
-- help.txt
(lainnya menyusul, tetap semangat utk idAthena!)
* Follow-up b7633db:
-- Menambahkan informasi pada script header
-- dan beberapa berubahan kecil
follow up r1029 at SVN

sorry for late sync
*Diterjemahkan: npc/airports/einbroch.txt
*Follow-up 9bed139
Merge dari idathena/trunk: Partial edit up to line #530 (nanakiwurtz <nanakiwurtz240@gmail.com>)
Follow up r1031
Merge branch 'master' of https://github.com/idathena/trunk
Follow up r1036
*Follow up r1037
Fully translated to Indonesian (npc/airports.txt)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
Follow up c99c4a0.

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
Follow up r1039
*Follow up r1041
*follow up r1046
follow up r1051
follow up r1054
r1062