Squashed commit of the following:

commit 6e933bec8a9549f264fc429ede91653e3bf66f74
Merge: e525f2f 165be9c
Author: Nicolaas Matthijs <nicolaasmatthijs@googlemail.com>
Date:   Mon Dec 29 16:49:26 2014 -0800

    Merge branch 'master' into CYB-367

    Conflicts:
    	app/assets/javascripts/angular/services/galleryService.js
    	app/assets/templates/gallery_likes.html

commit e525f2f0e7f719159680e33c255b331af8db84bc
Author: Nicolaas Matthijs <nicolaasmatthijs@googlemail.com>
Date:   Tue Dec 16 13:06:49 2014 -0800

    CYB-367 - Keep track of the current scroll position when going back to the gallery

    CYB-367 - Further debugging

    CYB-340 Comment on own gallery item should NOT score points for giving or receiving

    * Comparison was being made between different data types; the poster's id on the parent
       item was an integer (Fixnum) but the current_user.canvas_id was a String.
      Calling '#to_s' on both, if later current_user.canvas_id is refactored to return an Integer,
       this will make sure that even if this code is missed, it will still work correctly.  #to_s
       on a String just returns self.

    https://jira.ets.berkeley.edu/jira/browse/CYB-340

    CYB-375 The date is no longer returned in the /gallery/index feed

     * adding the 3 date fields that are taken from the Canvas API return values
       for each asset type to the selected values returned

    https://jira.ets.berkeley.edu/jira/browse/CYB-375

    CYB-377 Youtube URLs are not always https

    * changed the regular expression where it matched the protocol to always match
        http:// or https://
    * This will ensure that Youtube videos are handled as such.

    https://jira.ets.berkeley.edu/jira/browse/CYB-377

    CYB-374 - Sort on the correct property when sorting by date

    CYB-377 - Whitespace fix

    CYB-379 - thumbnail_default.svg - convert tabs to spaces and remove unused layers

    https://jira.ets.berkeley.edu/jira/browse/CYB-379

    CYB-385 Include all activity in the CSV, including passive points

     * removed the part of the WHERE clause restricting which types are returned.

    https://jira.ets.berkeley.edu/jira/browse/CYB-385

    CYB-386 Clean generic URLs in Thor

    * adds the 'generic_urls' table to the list of tables cleared by the task.

    https://jira.ets.berkeley.edu/jira/browse/CYB-386

    CYB-388 rename 'DataCultures Gallery' to 'Gallery'

     * change the parameters in the XML file

    https://jira.ets.berkeley.edu/jira/browse/CYB-388

    CYB-303, Add Sidekiq restart to deploy script

    WIP on scrolling

    CYB-367 - No longer reload the data on a every click
    CYB-367 - Keep track of the current scroll position when going back to the gallery

    CYB-367 - Removed unused dataculturesController

    CYB-367 - Improved list template

    CYB-378 - Added descriptive text for the like and dislike buttons

    CYB-378 - Added sr-only to the like and dislike buttons

    CYB-397 Remove some caching for Nico

    * removal of some cruft, initial attempts to cache

    https://jira.ets.berkeley.edu/jira/browse/CYB-397

    CYB-396 - Engagement index: unable to sort by "Last Point Earned"

    https://jira.ets.berkeley.edu/jira/browse/CYB-396

    The fix is to upgrade to AngularJS 1.3.7:
    https://github.com/angular/angular.js/blob/master/CHANGELOG.md#137-leaky-obstruction-2014-12-15

    CYB-367 - Resize the iFrame based on its content

    CYB-367 - Improved gallery documentation

    CYB-367 - Resize the iFrame when the filter and sorting options have changed

    CYB-367 - Refactored the engagement index tool

    CYB-367 - Removed the local canvas-include file

    CYB-367 - Improved iFrame resize function

    CYB-367 - Refactored the points configuration tool

    CYB-367 - Added documentation to the points configuration

    CYB-367 - Fixed up commenting and liking

    CYB-367 - Fixed author searching