Merge branch 'buck-nine-deferred-pool' of git://github.com/bukzor/buildbot into nine

(with attribution to Terry Jones in deferredpool.py)
Merge branch 'buck-nine-fix-trigger-step-fake' of git://github.com/bukzor/buildbot into nine
fix waited_for input type
Merge branch 'nine' of git://github.com/tardyp/buildbot into nine
split out coffeescript style docs into their own file

Plus some copyediting of those docs.
uncomment extra StepsEndpoint test
Merge branch 'master' into nine

Conflicts:
	master/buildbot/schedulers/basic.py
	master/buildbot/schedulers/forcesched.py
	master/buildbot/schedulers/timed.py
	master/buildbot/sourcestamp.py
	master/buildbot/status/web/base.py
	master/buildbot/status/web/build.py
	master/buildbot/status/web/files/default.css
	master/buildbot/status/web/logs.py
	master/buildbot/status/web/templates/build_line.html
	master/buildbot/status/web/templates/builder.html
	master/docs/manual/cfg-schedulers.rst
upgrade to angular 1.2 and bootstrap 3.0.0


Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
Merge pull request #858 from tardyp/nine

upgrade to angular 1.2 and bootstrap 3.0.0
test _masterDeactivated a bit better, and fix typo
fix pyflakes
P4 source changes:

* Made `mode` parameter support property interpolation
* Added ticket-based authentication
gruntFile: add coffeelint

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
setup.py: update to angular 1.2 rc-2

remove the bower_components dir in setup.py
to workaround bower not always updating to latest version

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
fix coding style

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
Merge branch 'nine' of git://github.com/tardyp/buildbot into nine
remove redundant 'return' and 'pass' statements
Merge branch 'pylint-return-in-init-nine' of git://github.com/elmirjagudin/buildbot into nine
Merge branch 'master' into nine

Conflicts:
	master/buildbot/config.py
	master/buildbot/test/unit/test_process_users_manual.py
Added support for ticket-based authentication to P4Poller.