ALM-213 use different cache key for oEmbed API call
ALM-679 change color of events in group discussed
ALM-679 color events based on group
ALM-679 change event color
ALM-679 small Javascript change
ALM-679 different color for events
ALM-679 color event
ALM-679 only color events that are not journal article
ALM-679 color body of events that are not citations
ALM-679 only color title of events that are not citations
Merge branch 'master' into develop

* master:
  ALM-679 small Javascript change
  ALM-679 change event color
  ALM-679 color events based on group
  ALM-679 change color of events in group discussed
  ALM-213 use different cache key for oEmbed API call
  ALM-675 don't use :role in strong_parameters
  ALM-675 go back to default user role
  ALM-675 allow assignment of user role
  ALM-675 added brakeman to Travis configuration
  ALM-675 new users have role "user"
  ALM-675 added latest version of brakeman gem
  ALM-673 only admin users should see profiling information
  ALM-673 number of rows in v5 API response as query parameter
  Add parameter for number of results in v5 API #33
  ALM-673 admin and staff users can see mini-profiler
  Updated documentation for PMC usage stats. Closes #69.
  ALM-674 change rake task to use delete_all
  ALM-673 load rack-mini-profiler at the end
  ALM-673 temporarily enable rack mini-profiler for all users
  ALM-673 show mini-profiler to staff users

Conflicts:
	app/assets/javascripts/articles/show.js
ALM-679 small tweak in CSS
change in brittle test
make installation of both pg and mysql gem the default
ALM-673 keep Gemfile.lock
Merge branch 'develop'

* develop:
  ALM-673 keep Gemfile.lock
  make installation of both pg and mysql gem the default
  change in brittle test
  ALM-679 small tweak in CSS
  ALM-679 only color title of events that are not citations
  ALM-679 color body of events that are not citations
  ALM-679 only color events that are not journal article
  ALM-679 color event
  ALM-679 different color for events