Show avatar in header toolbar
Rename 'subscribed' property to 'following'

* Subscriptions and followers are not the same. Subscriptions relate
to services that receive content from SwiftRiver via push. The spec
for this feature is still in the draft stage
Follow/unfollow users

* Added the follow button on the user's profile page.  When viewing the
profile of another user, the client issues performs an API request to check
whether the currently logged in user is following the visited user.
Display assets of the visited account

* Show the list of assets belonging the visited account. The API
does the work of filtering out the list of assets accessible to the
visiting user

* TODO: Change the "managing" tab to read "collaborating" when
on another users' content view
Implement bucket follow/unfollow. Refs #337

* Added the follow button on the buckets main view page

* Service methods to hook into the API methods for adding/removing
followers to/from a bucket
Do not catch exceptions

* Catching the exceptions in SwiftRiver_API_Buckets prevents them
from propagating to the controller that initiated the request. Therefore,
when an error occurs, the user doesn't receive the appropriate visual
feedback
Merge branch 'integration-dev' into buckets-ui-dev

Conflicts:
	modules/SwiftRiver_API/classes/SwiftRiver/API/Exception.php
	modules/SwiftRiver_API/classes/SwiftRiver/API/Exception/Unknown.php
Implement river follow/unfollow. Refs  #317

* Added the follow button on the rivers main view page

* SwiftRiver_API_Rivers methods for sending river follow/unfollow
requests to the API and relaying the result to the service methods
Masonry fix

* Increase the width of the drop "container" to 31.25%
Merge branch 'integration-dev' into buckets-ui-dev

Conflicts:
	application/classes/Controller/User.php
	application/classes/Service/River.php
	modules/SwiftRiver_API/classes/SwiftRiver/API/Accounts.php
	modules/SwiftRiver_API/classes/SwiftRiver/API/Rivers.php
Add links, tags to river and bucket drops

* Additional links, tags etc are specific to drops within a specific
river or a bucket

* Renamed Controller_Drop_Base to Controller_Drop_Container and
made it an abstract class with methods that must be implemented by
all classes that extend it
Fix: Wrong link in @package doc tag
Get/add river/bucket drop comments

* Removed unnecessary methods from Service_Drop and
SwiftRiver_API_Drops
Remove drop from river

* Show the "delete" and "mark as read" buttons on hover

* API and service methods for removing a drop from a river
Implement bucket commenting. Refs #337

* Service and  API methods for adding and deleting bucket
comments

* Options for filtering comments to show all or only those created
by the currently logged in user