pull merge
delete eof
Merge branch 'cc-1.6' of github.com:ma-ito/BuddyPress-theme into cc-1.6