update rake
Merge remote-tracking branch 'origin/master'
style
update style axtivities
rake update