Refactored bootstrap
Improved flexibility of TaskPikerCombo.
Syntax fix
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	script/bootstrap.js