Merge pull request #91 from mlaa/develop

force reload of CSS files on new versions
Revert "add title attr to thumbnails for feature slider tooltip, fixes #94"

This reverts commit f1f1c40dcbf35a3bb266d9a8ba44c2195b540798.
Moving this to the next minor version release instead of the bugfix
release.
disabling forum search until I can get it working, per #92
add dummy prefix so debug.log will stop complaining; see #84
whitespace and other style changes per WP Coding Standards
stop overriding bp docs template

so that my modifications to the fork of bp docs will work
and we can disable attachments per mlaa/buddypress-docs#2
Revert "stop overriding bp docs template"

Whoops! Committed to master by mistake.

This reverts commit cc752da762c3b29f859c0c1a1ad7138b4459849a.
import invites template from cbox-theme
wrap invite stuff in div.item
add header metadata back to style.scss

fixes issues with reloading theme
Merge remote-tracking branch 'origin/bugfix'
Merge branch 'master' of https://github.com/mlaa/cbox-mla
Merge branch 'master' of https://github.com/mlaa/cbox-mla into next

Conflicts:
	style.css.map
style cacap avatar like cbox-mla avatar
link to portfolio from activity area
Merge branch 'cacap' of https://github.com/mlaa/cbox-mla into cacap