starting to fix annotation api call
fix Annotation deletion bug
add rollback protection for annotation "extras"
fix bug in single annotation route
add track by clause on ng-repeat element to prevent dupes error
disallow users to delete / update annotations.  This resolves #178
fix comment user names not showing up in sidebar
add soft deletes, fix activity stream dupes / index issues
add login popup as a service in madison.services.
fix orderBy / track by breaking animation
re-add support / oppose buttons.  resolves #184
- Initial implementation of the Entrust RBAC module for the admin section
- Created Database seeds for creating a user, and giving them admin permissions (user: john@coggeshall.org, pass: foobar)
- Updated existing permission checks to use RBAC
- Reorganized code a bit regarding filters, etc.
- Added additional RBAC checks for dashboard
- Removed now unecessary user_level column in users table
ignore /public/private folder ( for install-specific js )
set markdown package to stable version
Merge branch 'issue171'

Conflicts:
	app/models/User.php
	composer.json
remove references to user_level
add browsehappy prompt
add ng-app id required for ie
Fixing first-time annotation alert window, which somehow lost stuff in its' .blade file
Oops removing some accident cut/paste