Use variables to set highlight button background
Merge remote-tracking branch 'origin/fix/7608_make_highlight_buttons_styleable' into dev
Fix API requests without CSRF token being rejected
CSRF Protection: Don't attempt to catch unused InvalidAuthenticityToken

Rails doesn't raise InvalidAuthenticityToken since 3.0.4

For more information, see
http://weblog.rubyonrails.org/2011/2/8/csrf-protection-bypass-in-ruby-on-rails/
CSRF Protection: Prevent login CSRF
Merge pull request #1277 from opf/fix/api_csrf_protection

Fix API CSRF Protection and login CSRF
Bump version to 4.0.0pre1

We removed API v1, so the next release will be a major release
according to semantic versioning.
Update CHANGELOG.md
Refactor query property watching


Query property changes should only trigger reloads when the query hasn't been switched simultaneously
Put column watcher back into total total sums directive
Fix an edge case and simplify total sum updates
Lighten modal dialog background overlay

Signed-off-by: Alex Coles <alex@alexbcoles.com>
Add box-shadow to modal dialog, matching dropdowns

Signed-off-by: Alex Coles <alex@alexbcoles.com>
Merge pull request #1288 from opf/refactoring/query-property-watching

Refactoring/query property watching
Fixed typo which causes wiki pages to fail to load
Merge branch 'release/3.0' into dev
Merge branch 'dev' into dev-angular

Signed-off-by: Alex Coles <alex@alexbcoles.com>

Conflicts:
	app/assets/stylesheets/global/_mixins.sass
	app/assets/stylesheets/global/_variables.sass
Add livingstyleguide gem, its Compass dependency

Only pre-release versions of Compass are currently Sass 3.3
compatible.

Signed-off-by: Alex Coles <alex@alexbcoles.com>
Normalise naming of all Sass partials

A Sass source should never be compiled to a separate CSS file if its
filename:
  - begins with underscore.
  - has a .sass extension (and only .sass).

Signed-off-by: Alex Coles <alex@alexbcoles.com>
Add simplified 'meta' stylesheet for LSG

Signed-off-by: Alex Coles <alex@alexbcoles.com>