20140627
Merge branch 'master' of github.com:jubateAwNaN/original_content