dev commit test
Merge branch 'master' into dev
20140913
creating kimariji...
20140915 kimariji
modified kimariji back
added top button to kimariji