DEVELOPER-690 on state for navigation
Merge pull request #320 from pmuir/DEVELOPER-690

DEVELOPER-690 on state for navigation
Merge pull request #345 from pmuir/DEVELOPER-768

DEVELOPER-768 lowercase the ticket-monster tutorial URLs
Update wraith
Update cdn.yml
Update cdn.yml
Fixing video not spanning 100% DEVELOPER-771
hushing false warning. Fixes DEVELOPER-716
Fixing the Gemfile problem with rake update
Fixing up build problems locally.

Not sure if these are things that happened with a slim update or
something else, either way they're fixed now.

Conflicts:
	Gemfile.lock

Updating the Gemfile.lock file to latest
Using native DCP search highlighting versus regex. Fixes DEVELOPER-375
Merge pull request #355 from LightGuard/gemfile_issues

Gemfile & local build issues
Merge pull request #356 from wesbos/DEVELOPER-375

Using native DCP search highlighting versus regex. Fixes DEVELOPER-375
Merge pull request #354 from wesbos/DEVELOPER-716

hushing false warning. Fixes DEVELOPER-716
Merge pull request #353 from wesbos/DEVELOPER-771

Fixing video not spanning 100% DEVELOPER-771
Update cdn.yml
Update cdn.yml
Added the jboss/aerogear-simplepush-server Docker image to the list
Merge pull request #357 from goldmann/aerogear

Added the jboss/aerogear-simplepush-server Docker image to the list
Add an identifier for disqus comments