20141215 v1.0.0 -narae 어제 못올렸던것
Merge remote-tracking branch 'origin/master'