merged your changes to developing branch~

cuz I used automatic formatting function in eclipse so....
github recognize it as... delete all lines then added all lines~~ hehe:\