dev merge master 2014/10/20 on dev
2014/10/20 not thing update just test
2014/10/20 master merge dev